Merge pull request #2577 from github/aeisenberg/macos-13-runners

Move to macos-13 runners

.github/workflows/codeql.yml

@@ -75,7 +75,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04,ubuntu-22.04,windows-2019,windows-2022,macos-12,macos-13,macos-14]
+        os: [ubuntu-20.04,ubuntu-22.04,windows-2019,windows-2022,macos-13,macos-14]
         tools: ${{ fromJson(needs.check-codeql-versions.outputs.versions) }}
     runs-on: ${{ matrix.os }}
 

pr-checks/checks/multi-language-autodetect.yml

@@ -10,12 +10,13 @@ steps:
     id: init
     with:
       db-location: "${{ runner.temp }}/customDbLocation"
-      # Swift is not supported on Ubuntu so we manually exclude it from the list here
-      languages: ${{ runner.os == 'Linux' && 'cpp,csharp,go,java,javascript,python,ruby' || '' }}
+      # Swift is not supported on Ubuntu or codeql 2.14 so we manually exclude it from the list here
+      languages: ${{ (runner.os == 'Linux' || (runner.os == 'macOS' && matrix.version == 'stable-v2.14.6')) && 'cpp,csharp,go,java,javascript,python,ruby' || '' }}
       tools: ${{ steps.prepare-test.outputs.tools-url }}
 
   - uses: ./../action/.github/actions/setup-swift
-    if: runner.os == 'macOS'
+    # Exclude macos on v2.14.6 since we can not longer run swift on ARM runners
+    if: runner.os == 'macOS' && matrix.version != 'stable-v2.14.6'
     with:
       codeql-path: ${{ steps.init.outputs.codeql-path }}
 
@@ -68,7 +69,8 @@ steps:
       fi
 
   - name: Check language autodetect for Swift on macOS
-    if: runner.os == 'macOS'
+    # Exclude macos on v2.14.6 since we can not longer run swift on ARM runners
+    if: runner.os == 'macOS' && matrix.version != 'stable-v2.14.6'
     shell: bash
     run: |
       SWIFT_DB=${{ fromJson(steps.analysis.outputs.db-locations).swift }}

pr-checks/sync.py

@@ -84,7 +84,7 @@ def writeHeader(checkStream):
                 # "macos-latest" is now an ARM runner, so we run tests on the old CLIs on Intel runners instead.
                 if version in ["stable-v2.14.6"] and runnerImage == "macos-latest":
                     matrix.append({
-                        'os': "macos-12",
+                        'os': "macos-13",
                         'version': version
                     })
                 else:

tests/multi-language-repo/build.sh

@@ -8,7 +8,9 @@ javac Main.java
 
 go build main.go
 
+# Not all platforms support Swift
 if [[ "$OSTYPE" == "darwin"* ]]; then
+    echo "Compiling Swift"
     swift build
 fi