From 9d197dd25ed19a9d6c46954d47c597a9b5b3e266 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Thu, 21 Mar 2024 16:27:37 -0700 Subject: [PATCH] fixes --- .github/workflows/abtesting.yml | 2 +- .github/workflows/auth.yml | 2 +- .github/workflows/core.yml | 2 +- .github/workflows/core_internal.yml | 2 +- .github/workflows/crashlytics.yml | 2 +- .github/workflows/database.yml | 2 +- .github/workflows/firestore.yml | 2 +- .github/workflows/functions.yml | 10 +++++----- .github/workflows/installations.yml | 14 ++++++-------- .github/workflows/messaging.yml | 2 +- .github/workflows/remoteconfig.yml | 2 +- .github/workflows/sessions.yml | 2 +- .github/workflows/shared-swift.yml | 2 +- 13 files changed, 22 insertions(+), 24 deletions(-) diff --git a/.github/workflows/abtesting.yml b/.github/workflows/abtesting.yml index 4f3ca15f02c..fbacdf8ba10 100644 --- a/.github/workflows/abtesting.yml +++ b/.github/workflows/abtesting.yml @@ -52,7 +52,7 @@ jobs: strategy: matrix: target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-12, macos-13] + os: [macos-12, macos-13, macos-14] include: - os: macos-12 xcode: Xcode_14.2 diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml index 9ea858c92e0..5982a658e2d 100644 --- a/.github/workflows/auth.yml +++ b/.github/workflows/auth.yml @@ -101,7 +101,7 @@ jobs: strategy: matrix: target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-12, macos-13] + os: [macos-12, macos-13, macos-14] include: - os: macos-12 xcode: Xcode_14.2 diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 1b615809b1e..fa8fdc061bb 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -45,7 +45,7 @@ jobs: strategy: matrix: target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-12, macos-13] + os: [macos-12, macos-13, macos-14] include: - os: macos-12 xcode: Xcode_14.2 diff --git a/.github/workflows/core_internal.yml b/.github/workflows/core_internal.yml index 7efa9fbf19e..87a4d0625b3 100644 --- a/.github/workflows/core_internal.yml +++ b/.github/workflows/core_internal.yml @@ -41,7 +41,7 @@ jobs: strategy: matrix: target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-12, macos-13] + os: [macos-12, macos-13, macos-14] include: - os: macos-12 xcode: Xcode_14.2 diff --git a/.github/workflows/crashlytics.yml b/.github/workflows/crashlytics.yml index 373e729ba21..de18dfe0f74 100644 --- a/.github/workflows/crashlytics.yml +++ b/.github/workflows/crashlytics.yml @@ -55,7 +55,7 @@ jobs: strategy: matrix: target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-12, macos-13] + os: [macos-12, macos-13, macos-14] include: - os: macos-12 xcode: Xcode_14.2 diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 8040d76adcd..88a8fa078a0 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -70,7 +70,7 @@ jobs: strategy: matrix: target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-12, macos-13] + os: [macos-12, macos-13, macos-14] include: - os: macos-12 xcode: Xcode_14.2 diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml index d4dae4f76a3..04f552fcb07 100644 --- a/.github/workflows/firestore.yml +++ b/.github/workflows/firestore.yml @@ -440,7 +440,7 @@ jobs: strategy: matrix: target: [iOS, tvOS, macOS] - os: [macos-12, macos-13] + os: [macos-12, macos-13, macos-14] include: - os: macos-12 xcode: Xcode_14.2 diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml index 0823dc33a49..d709e2280c9 100644 --- a/.github/workflows/functions.yml +++ b/.github/workflows/functions.yml @@ -36,11 +36,6 @@ jobs: xcode: Xcode_14.2 - os: macos-13 xcode: Xcode_15.2 - - os: macos-14 - xcode: Xcode_15.2 - - os: macos-14 - xcode: Xcode_15.2 - target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -99,6 +94,11 @@ jobs: xcode: Xcode_14.2 - os: macos-13 xcode: Xcode_15.2 + - os: macos-14 + xcode: Xcode_15.2 + - os: macos-14 + xcode: Xcode_15.2 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/installations.yml b/.github/workflows/installations.yml index b385d9d2144..730f70612e9 100644 --- a/.github/workflows/installations.yml +++ b/.github/workflows/installations.yml @@ -33,13 +33,6 @@ jobs: - os: macos-13 xcode: Xcode_15.2 test-specs: unit - - os: macos-14 - xcode: Xcode_15.2 - test-specs: unit - - os: macos-14 - xcode: Xcode_15.2 - target: visionOS - test-specs: unit runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 @@ -71,12 +64,17 @@ jobs: matrix: # TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532 target: [iOS, tvOS, macOS, watchOS, catalyst] - os: [macos-12, macos-13] + os: [macos-12, macos-13, macos-14] include: - os: macos-12 xcode: Xcode_14.2 - os: macos-13 xcode: Xcode_15.2 + - os: macos-14 + xcode: Xcode_15.2 + - os: macos-14 + xcode: Xcode_15.2 + target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml index eee8fcadc07..1a1b5316df1 100644 --- a/.github/workflows/messaging.yml +++ b/.github/workflows/messaging.yml @@ -84,7 +84,7 @@ jobs: strategy: matrix: target: [iOS, watchOS, tvOS, macOS, catalyst] - os: [macos-12, macos-13] + os: [macos-12, macos-13, macos-14] include: - os: macos-12 xcode: Xcode_14.2 diff --git a/.github/workflows/remoteconfig.yml b/.github/workflows/remoteconfig.yml index 5d378f71a2e..81997f52a9a 100644 --- a/.github/workflows/remoteconfig.yml +++ b/.github/workflows/remoteconfig.yml @@ -89,7 +89,7 @@ jobs: strategy: matrix: target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-12, macos-13] + os: [macos-12, macos-13, macos-14] include: - os: macos-12 xcode: Xcode_14.2 diff --git a/.github/workflows/sessions.yml b/.github/workflows/sessions.yml index 19607c0499c..f0f8a405f92 100644 --- a/.github/workflows/sessions.yml +++ b/.github/workflows/sessions.yml @@ -52,7 +52,7 @@ jobs: strategy: matrix: target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-12, macos-13] + os: [macos-12, macos-13, macos-14] include: - os: macos-12 xcode: Xcode_14.2 diff --git a/.github/workflows/shared-swift.yml b/.github/workflows/shared-swift.yml index 8fad2d4c5ca..50394c792da 100644 --- a/.github/workflows/shared-swift.yml +++ b/.github/workflows/shared-swift.yml @@ -47,7 +47,7 @@ jobs: strategy: matrix: target: [iOS, tvOS, macOS, catalyst, watchOS] - os: [macos-12, macos-13] + os: [macos-12, macos-13, macos-14] include: - os: macos-12 xcode: Xcode_14.2