Merge branch 'dev' into fix_launchAtStart

tisfeng · Feb 15, 2024 · 85d2e51 · 85d2e51
2 parents 572bc9e + a37871b
commit 85d2e51
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 54 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -27,7 +27,7 @@ jobs:
     #   - https://gh.io/supported-runners-and-hardware-resources
     #   - https://gh.io/using-larger-runners
     # Consider using larger runners for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-13') || 'ubuntu-latest' }}
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-14') || 'ubuntu-latest' }}
     timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
     permissions:
       actions: read
@@ -48,7 +48,7 @@ jobs:
       if: matrix.language == 'swift'
       uses: maxim-lobanov/setup-xcode@v1
       with:
-          xcode-version: '15.1'
+          xcode-version: '15.2'
 
     - name: Checkout repository
       uses: actions/checkout@v4

diff --git a/.github/workflows/objective-c-xcode.yml b/.github/workflows/objective-c-xcode.yml
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml