Update workflow for macOS

bab2min · Jul 2, 2024 · 8084222 · 8084222
1 parent 46c4139
commit 8084222
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 22 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -9,22 +9,16 @@ jobs:
     strategy:
       matrix:
         include:
-          - name: "macOS 11 + Xcode 11.7"
-            os: macos-11
+          - name: "macOS 13 + Xcode 15.0"
+            os: macos-13
+            arch: x86_64
             compiler: xcode
-            version: "11.7"
-          - name: "macOS 11 + Xcode 12.2"
-            os: macos-11
+            version: "15.0"
+          - name: "macOS 14 Arm64 + Xcode 15.0"
+            os: macos-14
+            arch: arm64
             compiler: xcode
-            version: "12.4"
-          - name: "macOS 11 + gcc-10"
-            os: macos-11
-            compiler: gcc
-            version: "10"
-          - name: "macOS 11 + gcc-11"
-            os: macos-11
-            compiler: gcc
-            version: "11"
+            version: "15.0"
 
     runs-on: ${{ matrix.os }}
     name: ${{ matrix.name }}
@@ -42,8 +36,8 @@ jobs:
         else
           ls -ls /Applications/
           sudo xcode-select -switch /Applications/Xcode_${{ matrix.version }}.app
-          echo "CC=clang" >> $GITHUB_ENV
-          echo "CXX=clang++" >> $GITHUB_ENV
+          echo "CC=$(brew --prefix llvm@15)/bin/clang" >> $GITHUB_ENV
+          echo "CXX=$(brew --prefix llvm@15)/bin/clang++" >> $GITHUB_ENV
         fi
     - name: Configure Build
       run: mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DKIWI_JAVA_BINDING=1 ..
@@ -74,11 +68,17 @@ jobs:
         ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out kowiki1000.txt
         KIWI_ARCH_TYPE=none ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out kowiki1000.txt
         KIWI_ARCH_TYPE=balanced ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out kowiki1000.txt
-        KIWI_ARCH_TYPE=sse2 ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out kowiki1000.txt
-        KIWI_ARCH_TYPE=sse4_1 ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out kowiki1000.txt
-        KIWI_ARCH_TYPE=avx2 ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out kowiki1000.txt
-        KIWI_ARCH_TYPE=avx2 ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out --sbg kowiki1000.txt
-        KIWI_ARCH_TYPE=avx2 ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out --typos 6 kowiki1000.txt
+        if [ "${{ matrix.arch }}" = "x86_64" ]; then
+          KIWI_ARCH_TYPE=sse2 ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out kowiki1000.txt
+          KIWI_ARCH_TYPE=sse4_1 ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out kowiki1000.txt
+          KIWI_ARCH_TYPE=avx2 ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out kowiki1000.txt
+          KIWI_ARCH_TYPE=avx2 ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out --sbg kowiki1000.txt
+          KIWI_ARCH_TYPE=avx2 ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out --typos 6 kowiki1000.txt
+        else
+          KIWI_ARCH_TYPE=neon ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out kowiki1000.txt
+          KIWI_ARCH_TYPE=neon ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out --sbg kowiki1000.txt
+          KIWI_ARCH_TYPE=neon ./build/kiwi-cli-* -m ./ModelGenerator -e -o test.out --typos 6 kowiki1000.txt
+        fi
     - name: Archive binaries
       uses: actions/upload-artifact@v2
       with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -144,7 +144,7 @@ jobs:
   build-macos:
     strategy:
       matrix:
-          os: [macos-11]
+          os: [macos-13]
           arch: [x86_64, arm64]
 
     runs-on: ${{ matrix.os }}