Merge pull request #137 from treastrain/update-runners

Update actions environment
treastrain · Oct 19, 2024 · 4bdd3d8 · 4bdd3d8
2 parents 071bd51 + 2a6f826
commit 4bdd3d8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
@@ -8,16 +8,15 @@ on:
     branches: [ tretnfckit-main ]
 
 env:
-  XCODE_SELECT_PATH: '/Applications/Xcode_16_Release_Candidate.app/Contents/Developer'
+  XCODE_SELECT_PATH: '/Applications/Xcode_16.app/Contents/Developer'
 
 jobs:
   show_software_information:
     name: Show software information
     strategy:
       fail-fast: false
       matrix:
-        # os: [macos-14, ubuntu-20.04, ubuntu-22.04]
-        os: [macos-14]
+        os: [macos-15, ubuntu-22.04, ubuntu-24.04]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -31,13 +30,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # os: [macos-14, ubuntu-20.04, ubuntu-22.04]
-        os: [macos-14]
+        os: [macos-15, ubuntu-22.04, ubuntu-24.04]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
     - name: Set Xcode version
-      if: ${{ matrix.os == 'macos-14' }}
+      if: ${{ matrix.os == 'macos-15' }}
       run: sudo xcode-select -s '${{ env.XCODE_SELECT_PATH }}'
     - name: Build
       run: swift build -v | tee swift-build_${{ matrix.os }}.log && exit ${PIPESTATUS[0]}

diff --git a/.github/workflows/xcodebuild.yml b/.github/workflows/xcodebuild.yml
@@ -9,19 +9,19 @@ on:
 
 env:
   SCHEME_NAME: TRETNFCKit-Package
-  IOS_SIMULATOR_NAME: iPhone 15 Pro
+  IOS_SIMULATOR_NAME: iPhone 16 Pro
   TVOS_SIMULATOR_NAME: Apple TV 4K (3rd generation)
   WATCHOS_SIMULATOR_NAME: Apple Watch Ultra 2 (49mm)
   VISIONOS_SIMULATOR_NAME: Apple Vision Pro
-  XCODE_SELECT_PATH: '/Applications/Xcode_16_Release_Candidate.app/Contents/Developer'
+  XCODE_SELECT_PATH: '/Applications/Xcode_16.app/Contents/Developer'
 
 jobs:
   show_software_information:
     name: Show software information
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14]
+        os: [macos-15]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -41,13 +41,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14]
+        os: [macos-15]
         platform: ['iOS', 'macOS-x86_64', 'macOS-arm64', 'macCatalyst-x86_64', 'macCatalyst-arm64', 'tvOS', 'watchOS', 'visionOS']
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
     - name: Set Xcode version
       run: sudo xcode-select -s '${{ env.XCODE_SELECT_PATH }}'
+    - name: Setup the platform
+      if: ${{ matrix.platform == 'visionOS' }}
+      run: |
+        sudo xcodebuild -runFirstLaunch
+        sudo xcrun simctl list
+        sudo xcodebuild -downloadPlatform visionOS
+        sudo xcodebuild -runFirstLaunch
     - name: Build the scheme
       run: |
         case ${{ matrix.platform }} in

diff --git a/.github/workflows/xcodebuild_for_example_app.yml b/.github/workflows/xcodebuild_for_example_app.yml
@@ -9,16 +9,16 @@ on:
 
 env:
   SCHEME_NAME: TRETNFCKitExample
-  IOS_SIMULATOR_NAME: iPhone 15 Pro
-  XCODE_SELECT_PATH: '/Applications/Xcode_16_Release_Candidate.app/Contents/Developer'
+  IOS_SIMULATOR_NAME: iPhone 16 Pro
+  XCODE_SELECT_PATH: '/Applications/Xcode_16.app/Contents/Developer'
 
 jobs:
   show_software_information:
     name: Show software information
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14]
+        os: [macos-15]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-14]
+        os: [macos-15]
         platform: ['iOS']
     runs-on: ${{ matrix.os }}
     steps: