From 20e51d3af7e756c42aa3665f7779f60563204c80 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 24 Jun 2025 13:19:16 -0400 Subject: [PATCH] [Infra] Bump to Xcode 16.4 on CI runners --- .github/workflows/analytics.yml | 2 +- .github/workflows/auth.yml | 2 +- .github/workflows/common.yml | 2 +- .github/workflows/common_cocoapods.yml | 2 +- .github/workflows/database.yml | 2 +- .github/workflows/firebaseai.yml | 2 +- .github/workflows/firestore.yml | 10 +++++----- .github/workflows/messaging.yml | 2 +- .github/workflows/remoteconfig.yml | 8 ++++---- .github/workflows/spm.yml | 2 +- .github/workflows/storage.yml | 2 +- .github/workflows/symbolcollision.yml | 2 +- .github/workflows/zip.yml | 14 +++++++------- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/analytics.yml b/.github/workflows/analytics.yml index 70f51071a03..59d7ddef646 100644 --- a/.github/workflows/analytics.yml +++ b/.github/workflows/analytics.yml @@ -29,7 +29,7 @@ jobs: - os: macos-14 xcode: Xcode_16.2 - os: macos-15 - xcode: Xcode_16.3 + xcode: Xcode_16.4 runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml index 9f207d650f5..03e8b2526f2 100644 --- a/.github/workflows/auth.yml +++ b/.github/workflows/auth.yml @@ -83,7 +83,7 @@ jobs: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Credentials.swift.gpg \ FirebaseAuth/Tests/SampleSwift/SwiftApiTests/Credentials.swift "$plist_secret" - name: Xcode - run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer + run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3 with: timeout_minutes: 120 diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml index 40ba550d095..cd359b0fe4f 100644 --- a/.github/workflows/common.yml +++ b/.github/workflows/common.yml @@ -89,7 +89,7 @@ jobs: strategy: matrix: os: [macos-15] - xcode: [Xcode_16.3] + xcode: [Xcode_16.4] platform: [iOS, tvOS, macOS, watchOS, catalyst, visionOS] include: - os: macos-14 diff --git a/.github/workflows/common_cocoapods.yml b/.github/workflows/common_cocoapods.yml index 6536c5a3f47..cf054ef7743 100644 --- a/.github/workflows/common_cocoapods.yml +++ b/.github/workflows/common_cocoapods.yml @@ -111,7 +111,7 @@ jobs: strategy: matrix: os: [macos-15] - xcode: [Xcode_16.3] + xcode: [Xcode_16.4] platform: [iOS, tvOS, macOS, watchOS] include: - os: macos-14 diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 6177b637cae..928c3bf28ad 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -63,7 +63,7 @@ jobs: - name: Install xcpretty run: gem install xcpretty - name: Xcode - run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer + run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: IntegrationTest # Only iOS to mitigate flakes. run: scripts/third_party/travis/retry.sh scripts/build.sh Database iOS integration diff --git a/.github/workflows/firebaseai.yml b/.github/workflows/firebaseai.yml index 1184ce74897..7ad2a9dff29 100644 --- a/.github/workflows/firebaseai.yml +++ b/.github/workflows/firebaseai.yml @@ -39,7 +39,7 @@ jobs: os: [macos-15] include: - os: macos-15 - xcode: Xcode_16.3 + xcode: Xcode_16.4 runs-on: ${{ matrix.os }} needs: spm env: diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml index 8f4ac2b1264..3e927287a2e 100644 --- a/.github/workflows/firestore.yml +++ b/.github/workflows/firestore.yml @@ -478,19 +478,19 @@ jobs: xcode: Xcode_16.2 target: iOS - os: macos-15 - xcode: Xcode_16.3 + xcode: Xcode_16.4 target: iOS - os: macos-15 - xcode: Xcode_16.3 + xcode: Xcode_16.4 target: tvOS - os: macos-15 - xcode: Xcode_16.3 + xcode: Xcode_16.4 target: macOS - os: macos-15 - xcode: Xcode_16.3 + xcode: Xcode_16.4 target: catalyst - os: macos-15 - xcode: Xcode_16.3 + xcode: Xcode_16.4 target: visionOS runs-on: ${{ matrix.os }} env: diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml index cd89ca840fc..838ce5fe4d9 100644 --- a/.github/workflows/messaging.yml +++ b/.github/workflows/messaging.yml @@ -66,7 +66,7 @@ jobs: run: scripts/configure_test_keychain.sh - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1 - name: Xcode - run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer + run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Setup Bundler run: scripts/setup_bundler.sh - name: Install xcpretty diff --git a/.github/workflows/remoteconfig.yml b/.github/workflows/remoteconfig.yml index dc764c6a88d..199fd669f41 100644 --- a/.github/workflows/remoteconfig.yml +++ b/.github/workflows/remoteconfig.yml @@ -70,7 +70,7 @@ jobs: run: ([ -z $plist_secret ] || scripts/generate_access_token.sh "$plist_secret" scripts/gha-encrypted/RemoteConfigSwiftAPI/ServiceAccount.json.gpg FirebaseRemoteConfig/Tests/Swift/AccessToken.json) - name: Xcode - run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer + run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Fake Console API Tests run: scripts/third_party/travis/retry.sh scripts/build.sh RemoteConfig ${{ matrix.target }} fakeconsole - name: IntegrationTest @@ -94,7 +94,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1 - name: Xcode - run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer + run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Setup quickstart run: scripts/setup_quickstart.sh config - name: Install Secret GoogleService-Info.plist @@ -144,7 +144,7 @@ jobs: - name: Setup Bundler run: scripts/setup_bundler.sh - name: Xcode - run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer + run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Prereqs run: scripts/install_prereqs.sh RemoteConfigSample iOS - name: Build @@ -165,7 +165,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1 - name: Xcode - run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer + run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Setup Bundler run: scripts/setup_bundler.sh - name: PodLibLint RemoteConfig Cron diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml index 97a897e2695..5b807927410 100644 --- a/.github/workflows/spm.yml +++ b/.github/workflows/spm.yml @@ -59,7 +59,7 @@ jobs: matrix: include: - os: macos-15 - xcode: Xcode_16.3 + xcode: Xcode_16.4 test: spm - os: macos-14 xcode: Xcode_16.2 diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index f9ffcc0aa73..036037b5ca7 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -43,7 +43,7 @@ jobs: language: [Swift, ObjC] include: - os: macos-15 - xcode: Xcode_16.3 + xcode: Xcode_16.4 env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} runs-on: ${{ matrix.os }} diff --git a/.github/workflows/symbolcollision.yml b/.github/workflows/symbolcollision.yml index 51fc88e262c..00fcde3c3e9 100644 --- a/.github/workflows/symbolcollision.yml +++ b/.github/workflows/symbolcollision.yml @@ -32,7 +32,7 @@ jobs: - name: Setup Bundler run: scripts/setup_bundler.sh - name: Xcode - run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer + run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Prereqs run: scripts/install_prereqs.sh SymbolCollision iOS - name: Build diff --git a/.github/workflows/zip.yml b/.github/workflows/zip.yml index 074fc1a26ad..9879e942885 100644 --- a/.github/workflows/zip.yml +++ b/.github/workflows/zip.yml @@ -116,7 +116,7 @@ jobs: - os: macos-15 xcode: Xcode_16.2 # - os: macos-15 - # xcode: Xcode_16.3 + # xcode: Xcode_16.4 runs-on: ${{ matrix.build-env.os }} steps: - uses: actions/checkout@v4 @@ -228,7 +228,7 @@ jobs: - os: macos-15 xcode: Xcode_16.2 # - os: macos-15 - # xcode: Xcode_16.3 + # xcode: Xcode_16.4 runs-on: ${{ matrix.build-env.os }} steps: - uses: actions/checkout@v4 @@ -279,7 +279,7 @@ jobs: - os: macos-15 xcode: Xcode_16.2 # - os: macos-15 - # xcode: Xcode_16.3 + # xcode: Xcode_16.4 runs-on: ${{ matrix.build-env.os }} steps: - uses: actions/checkout@v4 @@ -405,7 +405,7 @@ jobs: - os: macos-15 xcode: Xcode_16.2 # - os: macos-15 - # xcode: Xcode_16.3 + # xcode: Xcode_16.4 runs-on: ${{ matrix.build-env.os }} steps: - uses: actions/checkout@v4 @@ -489,7 +489,7 @@ jobs: - os: macos-15 xcode: Xcode_16.2 # - os: macos-15 - # xcode: Xcode_16.3 + # xcode: Xcode_16.4 runs-on: ${{ matrix.build-env.os }} steps: - uses: actions/checkout@v4 @@ -544,7 +544,7 @@ jobs: - os: macos-15 xcode: Xcode_16.2 # - os: macos-15 - # xcode: Xcode_16.3 + # xcode: Xcode_16.4 runs-on: ${{ matrix.build-env.os }} steps: - uses: actions/checkout@v4 @@ -599,7 +599,7 @@ jobs: - os: macos-15 xcode: Xcode_16.2 # - os: macos-15 - # xcode: Xcode_16.3 + # xcode: Xcode_16.4 runs-on: ${{ matrix.build-env.os }} steps: - uses: actions/checkout@v4