From 7bf30ea3ba1724b0126b2dfe946147bc2aace693 Mon Sep 17 00:00:00 2001 From: Andrew Heard Date: Fri, 8 Nov 2024 15:26:42 -0500 Subject: [PATCH 1/3] [Infra] Update firebase_app_check workflow to use macOS 15 for Xcode 16 --- .github/workflows/firebase_app_check.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/firebase_app_check.yml b/.github/workflows/firebase_app_check.yml index 613146e80fc..941cc0e5267 100644 --- a/.github/workflows/firebase_app_check.yml +++ b/.github/workflows/firebase_app_check.yml @@ -22,8 +22,11 @@ jobs: matrix: podspec: [FirebaseAppCheckInterop.podspec, FirebaseAppCheck.podspec] target: [ios, tvos, macos --skip-tests, watchos] - os: [macos-14] - xcode: [Xcode_15.2, Xcode_16] + include: + - os: macos-14 + xcode: Xcode_15.2 + - os: macos-15 + xcode: Xcode_16.1 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -128,22 +131,22 @@ jobs: xcode: Xcode_15.4 target: iOS - os: macos-15 - xcode: Xcode_16 + xcode: Xcode_16.1 target: iOS - os: macos-15 - xcode: Xcode_16 + xcode: Xcode_16.1 target: tvOS - os: macos-15 - xcode: Xcode_16 + xcode: Xcode_16.1 target: macOS - os: macos-15 - xcode: Xcode_16 + xcode: Xcode_16.1 target: watchOS - os: macos-15 - xcode: Xcode_16 + xcode: Xcode_16.1 target: catalyst - os: macos-15 - xcode: Xcode_16 + xcode: Xcode_16.1 target: visionOS runs-on: ${{ matrix.os }} steps: From 17dc32ee535667432520ac6afa28fad772c0c4d2 Mon Sep 17 00:00:00 2001 From: Andrew Heard Date: Fri, 8 Nov 2024 16:43:07 -0500 Subject: [PATCH 2/3] Stop mixing multiple matrices + include --- .github/workflows/firebase_app_check.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/firebase_app_check.yml b/.github/workflows/firebase_app_check.yml index 941cc0e5267..96caf2a5923 100644 --- a/.github/workflows/firebase_app_check.yml +++ b/.github/workflows/firebase_app_check.yml @@ -20,13 +20,20 @@ jobs: if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' strategy: matrix: - podspec: [FirebaseAppCheckInterop.podspec, FirebaseAppCheck.podspec] target: [ios, tvos, macos --skip-tests, watchos] include: - os: macos-14 xcode: Xcode_15.2 + podspec: FirebaseAppCheckInterop.podspec + - os: macos-14 + xcode: Xcode_15.2 + podspec: FirebaseAppCheck.podspec + - os: macos-15 + xcode: Xcode_16.1 + podspec: FirebaseAppCheckInterop.podspec - os: macos-15 xcode: Xcode_16.1 + podspec: FirebaseAppCheck.podspec runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 From b67dd3688461ce98d4f1cf82a261e423d7469007 Mon Sep 17 00:00:00 2001 From: Andrew Heard Date: Fri, 8 Nov 2024 17:00:38 -0500 Subject: [PATCH 3/3] Try `array` of `object`s matrix approach --- .github/workflows/firebase_app_check.yml | 27 +++++++++--------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/.github/workflows/firebase_app_check.yml b/.github/workflows/firebase_app_check.yml index 96caf2a5923..87452aecaa4 100644 --- a/.github/workflows/firebase_app_check.yml +++ b/.github/workflows/firebase_app_check.yml @@ -20,21 +20,14 @@ jobs: if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' strategy: matrix: + podspec: [FirebaseAppCheckInterop.podspec, FirebaseAppCheck.podspec] target: [ios, tvos, macos --skip-tests, watchos] - include: - - os: macos-14 - xcode: Xcode_15.2 - podspec: FirebaseAppCheckInterop.podspec + build-env: - os: macos-14 xcode: Xcode_15.2 - podspec: FirebaseAppCheck.podspec - os: macos-15 xcode: Xcode_16.1 - podspec: FirebaseAppCheckInterop.podspec - - os: macos-15 - xcode: Xcode_16.1 - podspec: FirebaseAppCheck.podspec - runs-on: ${{ matrix.os }} + runs-on: ${{ matrix.build-env.os }} steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 @@ -43,7 +36,7 @@ jobs: - name: Configure test keychain run: scripts/configure_test_keychain.sh - name: Xcode - run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer + run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer - name: FirebaseAppCheck run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }} @@ -138,22 +131,22 @@ jobs: xcode: Xcode_15.4 target: iOS - os: macos-15 - xcode: Xcode_16.1 + xcode: Xcode_16 target: iOS - os: macos-15 - xcode: Xcode_16.1 + xcode: Xcode_16 target: tvOS - os: macos-15 - xcode: Xcode_16.1 + xcode: Xcode_16 target: macOS - os: macos-15 - xcode: Xcode_16.1 + xcode: Xcode_16 target: watchOS - os: macos-15 - xcode: Xcode_16.1 + xcode: Xcode_16 target: catalyst - os: macos-15 - xcode: Xcode_16.1 + xcode: Xcode_16 target: visionOS runs-on: ${{ matrix.os }} steps: