Testing for Apple Silicon CI

ychin · Feb 5, 2024 · 67ae16a · 67ae16a
1 parent 4e39985
commit 67ae16a
Showing 1 changed file with 34 additions and 10 deletions.
diff --git a/.github/workflows/ci-macvim.yaml b/.github/workflows/ci-macvim.yaml
@@ -69,6 +69,13 @@ jobs:
           - os: macos-13
             xcode: '15.1'
             publish: true
+            optimized: true
+
+          # TEST TEST TEST
+          - os: macos-14
+            xcode: '15.2'
+            publish: true
+            optimized: true
 
     runs-on: ${{ matrix.os }}
 
@@ -94,11 +101,23 @@ jobs:
 
       - name: Set up Xcode
         if: matrix.xcode != ''
+        shell: zsh {0}
         run: |
           sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
           xcode-select -p
           xcodebuild -version
 
+      - name: Debugging info
+        run: |
+          echo Python3
+          where python3
+          echo Lua
+          where lua
+          echo brew prefix
+          brew --prefix
+          echo list homebrew locations
+          ls /usr/local/Cellar* /opt/homebrew/Cellar* || true;
+
       # Set up, install, and cache gettext library for localization.
       #
       - name: Set up gettext
@@ -120,6 +139,10 @@ jobs:
       # Set up remaining packages and tools
 
       - name: Install packages
+        run: |
+          brew install libtool
+
+      - name: Install scripting runtimes
         if: matrix.publish
         run: |
           # We no longer need to install/update Python 3, as it's guaranteed to
@@ -193,7 +216,8 @@ jobs:
             sed -i.bak -f ci/config.mk.clang-12.sed src/auto/config.mk
           fi
 
-          if ${{ matrix.publish == true && ! matrix.legacy }}; then
+          if ${{ matrix.optimized == true }}; then
+          #if ${{ matrix.publish == true && ! matrix.legacy }}; then
             # Only do O3/link-time optimizations for publish builds, so the other ones can still finish quickly to give
             # quick feedbacks. Only do this for non-legacy builds now as it seems the older toolchain doesn't work as
             # well for this.
@@ -330,15 +354,15 @@ jobs:
           set -o verbose
           make ${MAKE_BUILD_ARGS} -j${NPROC} -C src unittesttargets
 
-      - name: Test Vim
-        timeout-minutes: 20
-        run: make ${MAKE_BUILD_ARGS} test
-
-      - name: Test Vim (GUI)
-        timeout-minutes: 20
-        run: |
-          make ${MAKE_BUILD_ARGS} -C src/testdir clean
-          make ${MAKE_BUILD_ARGS} -C src testgui
+          #      - name: Test Vim
+          #        timeout-minutes: 20
+          #        run: make ${MAKE_BUILD_ARGS} test
+          #
+          #      - name: Test Vim (GUI)
+          #        timeout-minutes: 20
+          #        run: |
+          #          make ${MAKE_BUILD_ARGS} -C src/testdir clean
+          #          make ${MAKE_BUILD_ARGS} -C src testgui
 
       # Creates a DMG package of MacVim. Note that this doesn't create a GitHub release for us, because we would prefer to
       # do it manually, for two reasons: 1) signing / notarization are currently done out of CI, 2) we want to manually