|
40 | 40 | vi_cv_path_python: /Library/Frameworks/Python.framework/Versions/2.7/bin/python |
41 | 41 | vi_cv_path_python3: "%s/bin/python3" |
42 | 42 | vi_cv_path_plain_lua: "%s/bin/lua" |
43 | | - vi_cv_path_ruby: "%s/opt/ruby/bin/ruby" |
| 43 | + vi_cv_path_ruby: "%s/opt/ruby@3.4/bin/ruby" |
44 | 44 | vi_cv_dll_name_perl: /System/Library/Perl/%s/darwin-thread-multi-2level/CORE/libperl.dylib |
45 | 45 | vi_cv_dll_name_python: /Library/Frameworks/Python.framework/Versions/2.7/Python |
46 | 46 | vi_cv_dll_name_python3: /usr/local/Frameworks/Python.framework/Versions/Current/Python |
47 | 47 | vi_cv_dll_name_python3_arm64: /opt/homebrew/Frameworks/Python.framework/Versions/Current/Python |
48 | | - vi_cv_dll_name_ruby: /usr/local/opt/ruby/lib/libruby.dylib |
49 | | - vi_cv_dll_name_ruby_arm64: /opt/homebrew/opt/ruby/lib/libruby.dylib |
| 48 | + vi_cv_dll_name_ruby: /usr/local/opt/ruby@3.4/lib/libruby.dylib |
| 49 | + vi_cv_dll_name_ruby_arm64: /opt/homebrew/opt/ruby@3.4/lib/libruby.dylib |
50 | 50 | vi_cv_dll_name_lua: /usr/local/lib/liblua.dylib |
51 | 51 | vi_cv_dll_name_lua_arm64: /opt/homebrew/lib/liblua.dylib |
52 | 52 |
|
@@ -137,7 +137,7 @@ jobs: |
137 | 137 | # be installed on runners. Since we use stable ABI, the exact version |
138 | 138 | # on CI does not matter. |
139 | 139 |
|
140 | | - brew install --quiet ruby |
| 140 | + brew install --quiet ruby@3.4 # Ruby 4.0 is broken in Vim. Use 3.4 until that's fixed upstream. |
141 | 141 | brew install --quiet lua |
142 | 142 |
|
143 | 143 | if [[ -d $(brew --prefix)/Cellar/perl ]]; then |
@@ -228,6 +228,7 @@ jobs: |
228 | 228 | set -o verbose |
229 | 229 | # Ruby is keg-only in Homebrew, so need to manually link in the path so Vim will know where to look for the binaries. |
230 | 230 | perl -p -i -e "s#(?<=-DDYNAMIC_RUBY_DLL=\\\\\").*?(?=\\\\\")#${vi_cv_dll_name_ruby}#" src/auto/config.mk |
| 231 | + cat src/auto/config.mk |
231 | 232 | grep -q -- "-DDYNAMIC_PERL_DLL=\\\\\"${vi_cv_dll_name_perl}\\\\\"" src/auto/config.mk |
232 | 233 | grep -q -- "-DDYNAMIC_PYTHON_DLL=\\\\\"${vi_cv_dll_name_python}\\\\\"" src/auto/config.mk |
233 | 234 | grep -q -- "-DDYNAMIC_PYTHON3_DLL=\\\\\"${vi_cv_dll_name_python3}\\\\\"" src/auto/config.mk |
|
0 commit comments