From bc88abff7c332c6dcb56a79172ac169acdee8f12 Mon Sep 17 00:00:00 2001 From: ichizok Date: Wed, 12 Oct 2022 11:46:35 +0900 Subject: [PATCH 1/2] CI: Replace python 2.x framework Use the offical python 2.x framework's path --- .github/workflows/ci-macvim.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-macvim.yaml b/.github/workflows/ci-macvim.yaml index 4587a8895d..f3672f6e94 100644 --- a/.github/workflows/ci-macvim.yaml +++ b/.github/workflows/ci-macvim.yaml @@ -18,12 +18,12 @@ env: VERSIONER_PERL_VERSION: '5.18' VERSIONER_PYTHON_VERSION: '2.7' - vi_cv_path_python: /usr/bin/python + vi_cv_path_python: /usr/local/bin/python vi_cv_path_python3: /usr/local/bin/python3 vi_cv_path_plain_lua: /usr/local/bin/lua vi_cv_path_ruby: /usr/local/opt/ruby/bin/ruby vi_cv_dll_name_perl: /System/Library/Perl/5.18/darwin-thread-multi-2level/CORE/libperl.dylib - vi_cv_dll_name_python: /System/Library/Frameworks/Python.framework/Versions/2.7/Python + vi_cv_dll_name_python: /usr/local/Library/Frameworks/Python.framework/Versions/2.7/Python vi_cv_dll_name_python3: /usr/local/Frameworks/Python.framework/Versions/3.10/Python # Make sure to keep src/MacVim/vimrc synced with the Python version here for the Python DLL detection logic. vi_cv_dll_name_python3_arm64: /opt/homebrew/Frameworks/Python.framework/Versions/3.10/Python vi_cv_dll_name_ruby: /usr/local/opt/ruby/lib/libruby.dylib @@ -46,9 +46,9 @@ jobs: matrix: include: - os: macos-11 - xcode: '13.0' publish: true - os: macos-11 + xcode: '11.7' - os: macos-12 runs-on: ${{ matrix.os }} From c23024fe56a508f8a820c910f0032ee080c12aed Mon Sep 17 00:00:00 2001 From: ichizok Date: Sat, 15 Oct 2022 15:59:15 +0900 Subject: [PATCH 2/2] CI: Update the versions of actions --- .github/actions/universal-package/action.yml | 2 +- .github/workflows/ci-macvim.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/actions/universal-package/action.yml b/.github/actions/universal-package/action.yml index c790a41716..269dc9ff0b 100644 --- a/.github/actions/universal-package/action.yml +++ b/.github/actions/universal-package/action.yml @@ -27,7 +27,7 @@ runs: - name: Cache keg id: cache-keg - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: /usr/local/Cellar/${{ inputs.formula }} key: ${{ inputs.formula }}-homebrew-cache-patched-unified-${{ hashFiles(format('{0}.rb', inputs.formula)) }} diff --git a/.github/workflows/ci-macvim.yaml b/.github/workflows/ci-macvim.yaml index f3672f6e94..d8a61db404 100644 --- a/.github/workflows/ci-macvim.yaml +++ b/.github/workflows/ci-macvim.yaml @@ -54,7 +54,8 @@ jobs: runs-on: ${{ matrix.os }} steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v3 # Set up, install, and cache gettext library for localization. #