From 6945629c8749fbb7545bdf561c53ebdd16fe196a Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Tue, 9 Apr 2024 14:45:04 -0400 Subject: [PATCH] [Infra] Switch zip building over to Xcode 15.2 --- .github/workflows/zip.yml | 104 ++++++++++++++------------------------ 1 file changed, 37 insertions(+), 67 deletions(-) diff --git a/.github/workflows/zip.yml b/.github/workflows/zip.yml index 45578d33761..d2ca55d6766 100644 --- a/.github/workflows/zip.yml +++ b/.github/workflows/zip.yml @@ -28,14 +28,17 @@ jobs: package-release: # Don't run on private repo. if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' - runs-on: macos-12 + strategy: + matrix: + os: [macos-13, macos-13-arm64] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126 with: cache_key: package-release - - name: Xcode 14.1 - run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer + - name: Xcode 15.2 + run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer - uses: ruby/setup-ruby@v1 - name: Setup Bundler run: ./scripts/setup_bundler.sh @@ -54,11 +57,11 @@ jobs: build: # Don't run on private repo unless it is a PR. if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' - runs-on: macos-12 + runs-on: macos-13 steps: - uses: actions/checkout@v4 - - name: Xcode 14.1 - run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer + - name: Xcode 15.2 + run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer - name: Build run: | cd ReleaseTooling @@ -68,14 +71,17 @@ jobs: # Don't run on private repo. if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' needs: build - runs-on: macos-12 + strategy: + matrix: + os: [macos-13, macos-13-arm64] + runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126 with: cache_key: package-head - - name: Xcode 14.1 - run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer + - name: Xcode 15.2 + run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer - uses: ruby/setup-ruby@v1 - name: Setup Bundler run: ./scripts/setup_bundler.sh @@ -102,12 +108,8 @@ jobs: SDK: "ABTesting" strategy: matrix: - os: [macos-12, macos-13] - include: - - os: macos-12 - xcode: Xcode_14.2 - - os: macos-13 - xcode: Xcode_15.2 + os: [macos-13, macos-13-arm64] + xcode: Xcode_15.2 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -163,12 +165,8 @@ jobs: SDK: "Authentication" strategy: matrix: - os: [macos-12, macos-13] - include: - - os: macos-12 - xcode: Xcode_14.2 - - os: macos-13 - xcode: Xcode_15.2 + os: macos-13 + xcode: Xcode_15.2 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -216,12 +214,8 @@ jobs: SDK: "Config" strategy: matrix: - os: [macos-12, macos-13] - include: - - os: macos-12 - xcode: Xcode_14.2 - - os: macos-13 - xcode: Xcode_15.2 + os: macos-13 + xcode: Xcode_15.2 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -267,12 +261,8 @@ jobs: SDK: "Crashlytics" strategy: matrix: - os: [macos-12, macos-13] - include: - - os: macos-12 - xcode: Xcode_14.2 - - os: macos-13 - xcode: Xcode_15.2 + os: macos-13 + xcode: Xcode_15.2 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -341,10 +331,8 @@ jobs: SDK: "Database" strategy: matrix: - os: [macos-12] - include: - - os: macos-12 - xcode: Xcode_14.2 + os: macos-13 + xcode: Xcode_15.2 # TODO: Building FirebaseUI fails on Xcode 15 because it needs to sign the resources. # - os: macos-13 # xcode: Xcode_15.2 @@ -397,12 +385,8 @@ jobs: SDK: "DynamicLinks" strategy: matrix: - os: [macos-12, macos-13] - include: - - os: macos-12 - xcode: Xcode_14.2 - - os: macos-13 - xcode: Xcode_15.2 + os: macos-13 + xcode: Xcode_15.2 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -456,10 +440,8 @@ jobs: SDK: "Firestore" strategy: matrix: - os: [macos-12] - include: - - os: macos-12 - xcode: Xcode_14.2 + os: macos-13 + xcode: Xcode_15.2 # TODO: Building FirebaseUI fails on Xcode 15 because it needs to sign the resources. # - os: macos-13 # xcode: Xcode_15.2 @@ -508,8 +490,8 @@ jobs: FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1 runs-on: macos-13 steps: - - name: Xcode 14.1 - run: sudo xcode-select -s /Applications/Xcode_14.1.app/Contents/Developer + - name: Xcode 15.2 + run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer - uses: actions/checkout@v4 - name: Get framework dir uses: actions/download-artifact@v4 @@ -541,12 +523,8 @@ jobs: SDK: "InAppMessaging" strategy: matrix: - os: [macos-12, macos-13] - include: - - os: macos-12 - xcode: Xcode_14.2 - - os: macos-13 - xcode: Xcode_15.2 + os: macos-13 + xcode: Xcode_15.2 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -597,12 +575,8 @@ jobs: SDK: "Messaging" strategy: matrix: - os: [macos-12, macos-13] - include: - - os: macos-12 - xcode: Xcode_14.2 - - os: macos-13 - xcode: Xcode_15.2 + os: macos-13 + xcode: Xcode_15.2 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -652,12 +626,8 @@ jobs: SDK: "Storage" strategy: matrix: - os: [macos-12, macos-13] - include: - - os: macos-12 - xcode: Xcode_14.2 - - os: macos-13 - xcode: Xcode_15.2 + os: macos-13 + xcode: Xcode_15.2 runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4