chore: use the new m1 macos runner

callstack · Feb 2, 2024 · 8786dfb · 8786dfb
1 parent 8e0e96b
commit 8786dfb
Showing 1 changed file with 14 additions and 14 deletions.
diff --git a/.github/workflows/build-templates.yml b/.github/workflows/build-templates.yml
@@ -22,8 +22,8 @@ jobs:
       fail-fast: false
       matrix:
         os:
-          - ubuntu
-          - macos
+          - ubuntu-latest
+          - macos-14 # macos latest defaults to macos 12 at the moment.
         type:
           - module-legacy
           - module-mixed
@@ -37,9 +37,9 @@ jobs:
           - kotlin-objc
           - kotlin-swift
         exclude:
-          - os: macos
+          - os: macos-14
             language: kotlin-objc
-          - os: macos
+          - os: macos-14
             language: kotlin-swift
           - type: module-new
             language: java-swift
@@ -58,33 +58,33 @@ jobs:
           - type: view-mixed
             language: kotlin-swift
         include:
-          - os: ubuntu
+          - os: ubuntu-latest
             type: library
             language: js
-          - os: ubuntu
+          - os: ubuntu-latest
             type: module-legacy
             language: cpp
-          - os: ubuntu
+          - os: ubuntu-latest
             type: module-mixed
             language: cpp
-          - os: ubuntu
+          - os: ubuntu-latest
             type: module-new
             language: cpp
-          - os: macos
+          - os: macos-14
             type: module-legacy
             language: cpp
-          - os: macos
+          - os: macos-14
             type: module-mixed
             language: cpp
-          - os: macos
+          - os: macos-14
             type: module-new
             language: cpp
 
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}-${{ matrix.os }}-${{ matrix.type }}-${{ matrix.language }}
       cancel-in-progress: true
 
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout
@@ -140,14 +140,14 @@ jobs:
         working-directory: ${{ env.work_dir }}
         run: |
           # Build Android for only some matrices to skip redundant builds
-          if [[ ${{ matrix.os }} == ubuntu ]]; then
+          if [[ ${{ matrix.os }} == ubuntu-latest ]]; then
             if [[ ${{ matrix.type }} == view-* && ${{ matrix.language }} == *-objc ]] || [[ ${{ matrix.type }} == module-* && ${{ matrix.language }} == *-objc ]] || [[ ${{ matrix.type }} == module-* && ${{ matrix.language }} == cpp ]]; then
               echo "android_build=1" >> $GITHUB_ENV
             fi
           fi
 
           # Build iOS for only some matrices to skip redundant builds
-          if [[ ${{ matrix.os }} == macos ]]; then
+          if [[ ${{ matrix.os }} == macos-14 ]]; then
             if [[ ${{ matrix.type }} == view-* && ${{ matrix.language }} == java-* ]] || [[ ${{ matrix.type }} == module-* && ${{ matrix.language }} == java-* ]] || [[ ${{ matrix.type }} == module-* && ${{ matrix.language }} == cpp ]]; then
               echo "ios_build=1" >> $GITHUB_ENV
             fi