Fixes

firebase · Oct 31, 2023 · 6a4663a · 6a4663a
1 parent f10997d
commit 6a4663a
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml
@@ -64,7 +64,7 @@ jobs:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
-            xcode: xcode_15.0.1
+            xcode: Xcode_15.0.1
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -87,7 +87,7 @@ jobs:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
-            xcode: xcode_15.0.1
+            xcode: Xcode_15.0.1
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -128,7 +128,7 @@ jobs:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
-            xcode: xcode_15.0.1
+            xcode: Xcode_15.0.1
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
@@ -178,19 +178,16 @@ jobs:
   messaging-cron-only:
     # Don't run on private repo.
 #    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
-    runs-on: macos-12
     strategy:
       matrix:
         target: [ios, tvos, macos --skip-tests, watchos --skip-tests]
-        flags: [
-          '--use-static-frameworks'
-        ]
         os: [macos-12, macos-13]
         include:
           - os: macos-12
             xcode: Xcode_14.2
           - os: macos-13
-            xcode: xcode_15.0.1
+            xcode: Xcode_15.0.1
+    runs-on: ${{ matrix.os }}
     needs: pod-lib-lint
     steps:
     - uses: actions/checkout@v3
@@ -200,7 +197,7 @@ jobs:
     - name: Xcode
       run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
     - name: PodLibLint Messaging Cron
-      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=${{ matrix.target }}
+      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=${{ matrix.target }} --use-static-frameworks
 
   messaging-sample-build-test:
     # Don't run on private repo unless it is a PR.
@@ -223,7 +220,7 @@ jobs:
     - name: Prereqs
       run: scripts/install_prereqs.sh MessagingSample iOS
     - name: Xcode
-      run: sudo xcode-select -s /Applications/Xcode15.0.1.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/Xcode_15.0.1.app/Contents/Developer
     - name: Build
       run: ([ -z $plist_secret ] || scripts/build.sh MessagingSample iOS)
 
@@ -248,7 +245,7 @@ jobs:
     - name: Prereqs
       run: scripts/install_prereqs.sh SwiftUISample iOS
     - name: Xcode
-      run: sudo xcode-select -s /Applications/Xcode15.0.1.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/Xcode_15.0.1.app/Contents/Developer
     - name: Build
       run: ([ -z $plist_secret ] || scripts/build.sh SwiftUISample iOS)
 
@@ -273,7 +270,7 @@ jobs:
     - name: Prereqs
       run: scripts/install_prereqs.sh MessagingSampleStandaloneWatchApp watchOS
     - name: Xcode
-      run: sudo xcode-select -s /Applications/Xcode15.0.1.app/Contents/Developer
+      run: sudo xcode-select -s /Applications/Xcode_15.0.1.app/Contents/Developer
     - name: Build
       run: ([ -z $plist_secret ] || scripts/build.sh MessagingSampleStandaloneWatchApp watchOS)