From f09efcb84bd87e0e04455ff6ee59cca28c00afbe Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 7 Oct 2024 14:52:25 -0700 Subject: [PATCH 1/7] Xcode_16 will soon require macos-15 in GHA --- .github/workflows/abtesting.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/abtesting.yml b/.github/workflows/abtesting.yml index e16cb3ddb82..0ddde122deb 100644 --- a/.github/workflows/abtesting.yml +++ b/.github/workflows/abtesting.yml @@ -24,8 +24,13 @@ jobs: matrix: # TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532 target: [ios, tvos, macos --skip-tests, watchos] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + - os: macos-14 + xcode: Xcode_15.4 + - os: macos-15 + xcode: Xcode_16 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 From a976d0cc6f06a20420aae26e2d4236b638fa50da Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 7 Oct 2024 15:06:53 -0700 Subject: [PATCH 2/7] take 2 --- .github/workflows/abtesting.yml | 40 ++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/.github/workflows/abtesting.yml b/.github/workflows/abtesting.yml index 0ddde122deb..b72baf0eb3c 100644 --- a/.github/workflows/abtesting.yml +++ b/.github/workflows/abtesting.yml @@ -22,15 +22,25 @@ jobs: strategy: matrix: - # TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532 - target: [ios, tvos, macos --skip-tests, watchos] include: - os: macos-13 xcode: Xcode_15.2 + target: ios - os: macos-14 xcode: Xcode_15.4 + target: ios - os: macos-15 xcode: Xcode_16 + target: ios + - os: macos-15 + xcode: Xcode_16 + target: tvos + - os: macos-15 + xcode: Xcode_16 + target: macos + - os: macos-15 + xcode: Xcode_16 + target: watchos runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -76,9 +86,29 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + matrix: + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 From 43cef802ae4cea3a7abcba6128cfd8eee644f533 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 7 Oct 2024 15:11:39 -0700 Subject: [PATCH 3/7] fix --- .github/workflows/abtesting.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/abtesting.yml b/.github/workflows/abtesting.yml index b72baf0eb3c..3fc6d3df7d1 100644 --- a/.github/workflows/abtesting.yml +++ b/.github/workflows/abtesting.yml @@ -85,7 +85,6 @@ jobs: if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' needs: [spm-package-resolved] strategy: - matrix: matrix: include: - os: macos-13 From 5ebb626408a61821bd9b3d5695529757d5bc0838 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 7 Oct 2024 15:35:54 -0700 Subject: [PATCH 4/7] All spm and visionOS --- .github/workflows/abtesting.yml | 3 +++ .github/workflows/appdistribution.yml | 19 +++++++++++----- .github/workflows/auth.yml | 28 +++++++++++++++++++++--- .github/workflows/core.yml | 28 +++++++++++++++++++++--- .github/workflows/core_internal.yml | 28 +++++++++++++++++++++--- .github/workflows/crashlytics.yml | 28 +++++++++++++++++++++--- .github/workflows/database.yml | 28 +++++++++++++++++++++--- .github/workflows/dynamiclinks.yml | 9 ++++++-- .github/workflows/firebase_app_check.yml | 28 +++++++++++++++++++++--- .github/workflows/firestore.yml | 28 +++++++++++++++++++++--- .github/workflows/functions.yml | 28 +++++++++++++++++++++--- .github/workflows/inappmessaging.yml | 9 ++++++-- .github/workflows/installations.yml | 28 +++++++++++++++++++++--- .github/workflows/messaging.yml | 28 +++++++++++++++++++++--- .github/workflows/mlmodeldownloader.yml | 28 +++++++++++++++++++++--- .github/workflows/performance.yml | 16 +++++++++++--- .github/workflows/remoteconfig.yml | 28 +++++++++++++++++++++--- .github/workflows/sessions.yml | 28 +++++++++++++++++++++--- .github/workflows/storage.yml | 28 +++++++++++++++++++++--- .github/workflows/vertexai.yml | 28 +++++++++++++++++++++--- scripts/build.sh | 12 ++++++++++ 21 files changed, 430 insertions(+), 58 deletions(-) diff --git a/.github/workflows/abtesting.yml b/.github/workflows/abtesting.yml index 3fc6d3df7d1..10fe8f6d8b3 100644 --- a/.github/workflows/abtesting.yml +++ b/.github/workflows/abtesting.yml @@ -108,6 +108,9 @@ jobs: - os: macos-15 xcode: Xcode_16 target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/appdistribution.yml b/.github/workflows/appdistribution.yml index 8c80ed4116c..3734998e64d 100644 --- a/.github/workflows/appdistribution.yml +++ b/.github/workflows/appdistribution.yml @@ -21,9 +21,12 @@ jobs: strategy: matrix: - target: [ios] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + - os: macos-13 + xcode: Xcode_15.2 + - os: macos-14 + xcode: Xcode_15.4 + - os: macos-15 + xcode: Xcode_16 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -35,7 +38,7 @@ jobs: - name: Build and test run: | scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAppDistribution.podspec \ - --platforms=${{ matrix.target }} + --platforms=ios spm-package-resolved: env: @@ -66,8 +69,12 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + - os: macos-13 + xcode: Xcode_15.2 + - os: macos-14 + xcode: Xcode_15.4 + - os: macos-15 + xcode: Xcode_16 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml index 1c096c2fb37..b901888a98b 100644 --- a/.github/workflows/auth.yml +++ b/.github/workflows/auth.yml @@ -107,9 +107,31 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS spm, tvOS spm, macOS spmbuildonly, catalyst spm, watchOS spm] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS spm + - os: macos-14 + xcode: Xcode_15.4 + target: iOS spm + - os: macos-15 + xcode: Xcode_16 + target: iOS spm + - os: macos-15 + xcode: Xcode_16 + target: tvOS spm + - os: macos-15 + xcode: Xcode_16 + target: macOS spmbuildonly + - os: macos-15 + xcode: Xcode_16 + target: watchOS spm + - os: macos-15 + xcode: Xcode_16 + target: catalyst spm + - os: macos-15 + xcode: Xcode_16 + target: visionOS spm runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index d8f420f2af3..d3ac22b6b9b 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -64,9 +64,31 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/core_internal.yml b/.github/workflows/core_internal.yml index c1b38b07422..c9db19c0b3d 100644 --- a/.github/workflows/core_internal.yml +++ b/.github/workflows/core_internal.yml @@ -60,9 +60,31 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/crashlytics.yml b/.github/workflows/crashlytics.yml index ef4c0ba650c..fc303e70561 100644 --- a/.github/workflows/crashlytics.yml +++ b/.github/workflows/crashlytics.yml @@ -77,9 +77,31 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 17b1db109e6..86e1f42a109 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -86,9 +86,31 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/dynamiclinks.yml b/.github/workflows/dynamiclinks.yml index 4fcd9624616..777cba16742 100644 --- a/.github/workflows/dynamiclinks.yml +++ b/.github/workflows/dynamiclinks.yml @@ -64,8 +64,13 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + - os: macos-14 + xcode: Xcode_15.4 + - os: macos-15 + xcode: Xcode_16 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/firebase_app_check.yml b/.github/workflows/firebase_app_check.yml index d001709535a..613146e80fc 100644 --- a/.github/workflows/firebase_app_check.yml +++ b/.github/workflows/firebase_app_check.yml @@ -120,9 +120,31 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml index 4c98182f859..cbbf0f7095d 100644 --- a/.github/workflows/firestore.yml +++ b/.github/workflows/firestore.yml @@ -461,9 +461,31 @@ jobs: (github.event_name == 'pull_request') strategy: matrix: - target: [iOS, tvOS, macOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} env: FIREBASE_SOURCE_FIRESTORE: 1 diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml index d4207217be3..226583412e0 100644 --- a/.github/workflows/functions.yml +++ b/.github/workflows/functions.yml @@ -108,9 +108,31 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/inappmessaging.yml b/.github/workflows/inappmessaging.yml index c766fd89f31..c8d70fbeff4 100644 --- a/.github/workflows/inappmessaging.yml +++ b/.github/workflows/inappmessaging.yml @@ -91,8 +91,13 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + - os: macos-14 + xcode: Xcode_15.4 + - os: macos-15 + xcode: Xcode_16 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/installations.yml b/.github/workflows/installations.yml index 883fa696ae9..3a1da8aa802 100644 --- a/.github/workflows/installations.yml +++ b/.github/workflows/installations.yml @@ -85,9 +85,31 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml index acc9d6d8c2c..8acccc947f0 100644 --- a/.github/workflows/messaging.yml +++ b/.github/workflows/messaging.yml @@ -107,9 +107,31 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS spm, tvOS spmbuildonly, macOS spmbuildonly, catalyst spmbuildonly, watchOS spmbuildonly] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS spm + - os: macos-14 + xcode: Xcode_15.4 + target: iOS spmbuildonly + - os: macos-15 + xcode: Xcode_16 + target: iOS spm + - os: macos-15 + xcode: Xcode_16 + target: tvOS spmbuildonly + - os: macos-15 + xcode: Xcode_16 + target: macOS spmbuildonly + - os: macos-15 + xcode: Xcode_16 + target: watchOS spmbuildonly + - os: macos-15 + xcode: Xcode_16 + target: catalyst spmbuildonly + - os: macos-15 + xcode: Xcode_16 + target: visionOS spmbuildonly runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/mlmodeldownloader.yml b/.github/workflows/mlmodeldownloader.yml index feae6c76383..4af27dabc4b 100644 --- a/.github/workflows/mlmodeldownloader.yml +++ b/.github/workflows/mlmodeldownloader.yml @@ -21,9 +21,31 @@ jobs: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} strategy: matrix: - target: [ios, tvos, macos, watchos] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index f58bb912a18..67a89aef2ae 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -147,9 +147,19 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS, tvOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/remoteconfig.yml b/.github/workflows/remoteconfig.yml index 200c19801cf..4fbf6aa191d 100644 --- a/.github/workflows/remoteconfig.yml +++ b/.github/workflows/remoteconfig.yml @@ -114,9 +114,31 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/sessions.yml b/.github/workflows/sessions.yml index c4edb685e1f..73fff13c7aa 100644 --- a/.github/workflows/sessions.yml +++ b/.github/workflows/sessions.yml @@ -78,9 +78,31 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index b93f4b9141d..eb1dd9f8f0f 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -88,9 +88,31 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/vertexai.yml b/.github/workflows/vertexai.yml index 2e427be3bb7..0fc37a0cd3c 100644 --- a/.github/workflows/vertexai.yml +++ b/.github/workflows/vertexai.yml @@ -41,9 +41,31 @@ jobs: spm-unit: strategy: matrix: - target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} needs: spm-package-resolved env: diff --git a/scripts/build.sh b/scripts/build.sh index 1fd68410596..6e3b27a1e08 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -143,16 +143,28 @@ if [[ "$xcode_major" -lt 15 ]]; then -sdk 'iphonesimulator' -destination 'platform=iOS Simulator,name=iPhone 14' ) + watchos_flags=( + -sdk 'watchsimulator' + -destination 'platform=watchOS Simulator,name=Apple Watch Series 7 (45mm)' + ) elif [[ "$xcode_major" -lt 16 ]]; then ios_flags=( -sdk 'iphonesimulator' -destination 'platform=iOS Simulator,name=iPhone 15' ) + watchos_flags=( + -sdk 'watchsimulator' + -destination 'platform=watchOS Simulator,name=Apple Watch Series 7 (45mm)' + ) else ios_flags=( -sdk 'iphonesimulator' -destination 'platform=iOS Simulator,name=iPhone 16' ) + watchos_flags=( + -sdk 'watchsimulator' + -destination 'platform=watchOS Simulator,name=Apple Watch Series 10 (42mm) ' + ) fi ios_device_flags=( From cbc025ad1b126b210bc34f2d23f70c248d8a36f5 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 7 Oct 2024 15:53:35 -0700 Subject: [PATCH 5/7] watch fix --- .github/workflows/appdistribution.yml | 1 + scripts/build.sh | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/appdistribution.yml b/.github/workflows/appdistribution.yml index 3734998e64d..731d54f1852 100644 --- a/.github/workflows/appdistribution.yml +++ b/.github/workflows/appdistribution.yml @@ -69,6 +69,7 @@ jobs: needs: [spm-package-resolved] strategy: matrix: + include: - os: macos-13 xcode: Xcode_15.2 - os: macos-14 diff --git a/scripts/build.sh b/scripts/build.sh index 6e3b27a1e08..c5229b3ff9f 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -185,10 +185,6 @@ tvos_flags=( -sdk "appletvsimulator" -destination 'platform=tvOS Simulator,name=Apple TV' ) -watchos_flags=( - -sdk 'watchsimulator' - -destination 'platform=watchOS Simulator,name=Apple Watch Series 7 (45mm)' -) visionos_flags=( -sdk 'xrsimulator' -destination 'platform=visionOS Simulator,name=Apple Vision Pro' From 19574ae0c3354d32e2c93f486fea1da9e127ea23 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 7 Oct 2024 16:14:30 -0700 Subject: [PATCH 6/7] space removal --- .github/workflows/appdistribution.yml | 1 + scripts/build.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/appdistribution.yml b/.github/workflows/appdistribution.yml index 731d54f1852..93e8df329ee 100644 --- a/.github/workflows/appdistribution.yml +++ b/.github/workflows/appdistribution.yml @@ -21,6 +21,7 @@ jobs: strategy: matrix: + include: - os: macos-13 xcode: Xcode_15.2 - os: macos-14 diff --git a/scripts/build.sh b/scripts/build.sh index c5229b3ff9f..f3f5525a29b 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -163,7 +163,7 @@ else ) watchos_flags=( -sdk 'watchsimulator' - -destination 'platform=watchOS Simulator,name=Apple Watch Series 10 (42mm) ' + -destination 'platform=watchOS Simulator,name=Apple Watch Series 10 (42mm)' ) fi From 53400afd350a50212b22406777d6fedb5e84132c Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Mon, 7 Oct 2024 18:20:33 -0700 Subject: [PATCH 7/7] fixes --- .github/workflows/auth.yml | 4 +- .github/workflows/firestore.yml | 5 +-- .github/workflows/mlmodeldownloader.yml | 56 ++++++++++++------------- .github/workflows/spm.yml | 9 ++-- 4 files changed, 34 insertions(+), 40 deletions(-) diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml index b901888a98b..a65db1340c8 100644 --- a/.github/workflows/auth.yml +++ b/.github/workflows/auth.yml @@ -58,7 +58,7 @@ jobs: matrix: podspec: [FirebaseAuthInterop.podspec, FirebaseAuth.podspec] target: [ios, tvos, macos --skip-tests --allow-warnings, watchos] - os: [macos-14] + os: [macos-15] xcode: [Xcode_16] runs-on: ${{ matrix.os }} steps: @@ -161,7 +161,7 @@ jobs: env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1 - runs-on: macos-14 + runs-on: macos-15 steps: - uses: actions/checkout@v4 - uses: actions/cache/restore@v4 diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml index cbbf0f7095d..e57cb9d7088 100644 --- a/.github/workflows/firestore.yml +++ b/.github/workflows/firestore.yml @@ -405,7 +405,7 @@ jobs: - os: macos-13 platforms: 'ios' include: - - os: macos-14 + - os: macos-15 xcode: Xcode_16 - os: macos-13 xcode: Xcode_15.2 @@ -477,9 +477,6 @@ jobs: - os: macos-15 xcode: Xcode_16 target: macOS - - os: macos-15 - xcode: Xcode_16 - target: watchOS - os: macos-15 xcode: Xcode_16 target: catalyst diff --git a/.github/workflows/mlmodeldownloader.yml b/.github/workflows/mlmodeldownloader.yml index 4af27dabc4b..81da1ab1a83 100644 --- a/.github/workflows/mlmodeldownloader.yml +++ b/.github/workflows/mlmodeldownloader.yml @@ -21,31 +21,9 @@ jobs: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} strategy: matrix: - include: - - os: macos-13 - xcode: Xcode_15.2 - target: iOS - - os: macos-14 - xcode: Xcode_15.4 - target: iOS - - os: macos-15 - xcode: Xcode_16 - target: iOS - - os: macos-15 - xcode: Xcode_16 - target: tvOS - - os: macos-15 - xcode: Xcode_16 - target: macOS - - os: macos-15 - xcode: Xcode_16 - target: watchOS - - os: macos-15 - xcode: Xcode_16 - target: catalyst - - os: macos-15 - xcode: Xcode_16 - target: visionOS + target: [ios, tvos, macos, watchos] + os: [macos-14] + xcode: [Xcode_15.2, Xcode_16] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -116,9 +94,31 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-13 + xcode: Xcode_15.2 + target: iOS + - os: macos-14 + xcode: Xcode_15.4 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: iOS + - os: macos-15 + xcode: Xcode_16 + target: tvOS + - os: macos-15 + xcode: Xcode_16 + target: macOS + - os: macos-15 + xcode: Xcode_16 + target: watchOS + - os: macos-15 + xcode: Xcode_16 + target: catalyst + - os: macos-15 + xcode: Xcode_16 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml index fec6410ca5d..8986f7b8d82 100644 --- a/.github/workflows/spm.yml +++ b/.github/workflows/spm.yml @@ -51,9 +51,8 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - os: [macos-14] include: - - os: macos-14 + - os: macos-15 xcode: Xcode_16 test: spm - os: macos-14 @@ -89,11 +88,10 @@ jobs: needs: [spm-package-resolved] strategy: matrix: - os: [macos-14] include: - os: macos-14 xcode: Xcode_15.3 - - os: macos-14 + - os: macos-15 xcode: Xcode_16 runs-on: ${{ matrix.os }} steps: @@ -121,9 +119,8 @@ jobs: # visionOS isn't buildable from here (even with Firestore source) because the test # targets need Analytics. target: [tvOS, macOS, catalyst] - os: [macos-14] include: - - os: macos-14 + - os: macos-15 xcode: Xcode_16 - os: macos-14 xcode: Xcode_15.3