Skip to content

Commit

Permalink
Merge 7f06327 into 8a3dae5
Browse files Browse the repository at this point in the history
  • Loading branch information
paulb777 authored Nov 15, 2023
2 parents 8a3dae5 + 7f06327 commit 7d74e18
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 15 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/abtesting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ jobs:

strategy:
matrix:
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
target: [ios, tvos, macos --skip-tests, watchos]
target: [ios, tvos, macos, watchos]
os: [macos-12, macos-13]
include:
- os: macos-12
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/auth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ jobs:
strategy:
matrix:
podspec: [FirebaseAuthInterop.podspec, FirebaseAuth.podspec]
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
target: [ios, tvos, macos --skip-tests, watchos]
target: [ios, tvos, macos, watchos]
os: [macos-12, macos-13]
include:
- os: macos-12
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ jobs:
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
strategy:
matrix:
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
target: [ios, tvos, macos --skip-tests, watchos]
target: [ios, tvos, macos, watchos]
os: [macos-12, macos-13]
include:
- os: macos-12
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ jobs:
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
strategy:
matrix:
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
target: [ios, tvos, macos --skip-tests, watchos]
target: [ios, tvos, macos, watchos]
os: [macos-12, macos-13]
include:
- os: macos-12
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/firebase_app_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ jobs:
strategy:
matrix:
podspec: [FirebaseAppCheckInterop.podspec, FirebaseAppCheck.podspec]
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
target: [ios, tvos, macos --skip-tests, watchos]
target: [ios, tvos, macos, watchos]
os: [macos-12, macos-13]
include:
- os: macos-12
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/installations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ jobs:
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
strategy:
matrix:
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
target: [ios, tvos, macos --skip-tests, watchos]
target: [ios, tvos, macos, watchos]
os: [macos-12, macos-13]
include:
- os: macos-12
Expand Down Expand Up @@ -63,7 +62,6 @@ jobs:
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
strategy:
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]
include:
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/remoteconfig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ jobs:

strategy:
matrix:
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
target: [ios, tvos, macos --skip-tests, watchos]
target: [ios, tvos, macos, watchos]
podspec: [FirebaseRemoteConfig.podspec, FirebaseRemoteConfigSwift.podspec --allow-warnings --skip-tests]
os: [macos-12, macos-13]
include:
Expand Down

0 comments on commit 7d74e18

Please sign in to comment.