Skip to content

Commit b2151d4

Browse files
authored
Merge branch 'main' into nc/fst-ci
2 parents b21c979 + b6eacbf commit b2151d4

19 files changed

+45
-68
lines changed

.github/workflows/abtesting.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
- '.github/workflows/abtesting.yml'
1313
- '.github/workflows/common.yml'
1414
# - '.github/workflows/common_cocoapods.yml'
15+
- '.github/workflows/common_catalyst.yml'
1516
- 'Gemfile*'
1617
schedule:
1718
# Run every day at 1am(PST) - cron uses UTC times

.github/workflows/appdistribution.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- '.github/workflows/appdistribution.yml'
1212
- '.github/workflows/common.yml'
1313
# - '.github/workflows/common_cocoapods.yml'
14+
- '.github/workflows/common_catalyst.yml'
1415
- 'Gemfile*'
1516
schedule:
1617
# Run every day at 1am (PST) - cron uses UTC times

.github/workflows/auth.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
- '.github/workflows/auth.yml'
1313
- '.github/workflows/common.yml'
1414
# - '.github/workflows/common_cocoapods.yml'
15+
- '.github/workflows/common_catalyst.yml'
1516
- 'scripts/gha-encrypted/AuthSample/SwiftApplication.plist.gpg'
1617
- 'Gemfile*'
1718
schedule:

.github/workflows/core.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- '.github/workflows/core.yml'
1212
- '.github/workflows/common.yml'
1313
# - '.github/workflows/common_cocoapods.yml'
14+
- '.github/workflows/common_catalyst.yml'
1415
- 'Gemfile*'
1516
schedule:
1617
# Run every day at 2am (PST) - cron uses UTC times

.github/workflows/core_internal.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
- '.github/workflows/core_internal.yml'
1313
- '.github/workflows/common.yml'
1414
# - '.github/workflows/common_cocoapods.yml'
15+
- '.github/workflows/common_catalyst.yml'
1516
- 'Gemfile*'
1617
schedule:
1718
# Run every day at 2am (PST) - cron uses UTC times

.github/workflows/crashlytics.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
- '.github/workflows/crashlytics.yml'
1313
- '.github/workflows/common.yml'
1414
# - '.github/workflows/common_cocoapods.yml'
15+
- '.github/workflows/common_catalyst.yml'
1516
- 'Interop/Analytics/Public/*.h'
1617
- 'Gemfile*'
1718
schedule:

.github/workflows/database.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ on:
1515
- '.github/workflows/database.yml'
1616
- '.github/workflows/common.yml'
1717
# - '.github/workflows/common_cocoapods.yml'
18+
- '.github/workflows/common_catalyst.yml'
1819
- 'Gemfile*'
1920
- 'scripts/run_database_emulator.sh'
2021
schedule:

.github/workflows/firebase_app_check.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- '.github/workflows/firebase_app_check.yml'
1212
- '.github/workflows/common.yml'
1313
# - '.github/workflows/common_cocoapods.yml'
14+
- '.github/workflows/common_catalyst.yml'
1415
- 'Gemfile*'
1516
schedule:
1617
# Run every day at 11pm (PST) - cron uses UTC times

.github/workflows/installations.yml

Lines changed: 16 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
name: installations
22

3+
permissions:
4+
contents: read
5+
36
on:
47
workflow_dispatch:
58
pull_request:
69
paths:
710
- 'FirebaseInstallations**'
811
- '.github/workflows/installations.yml'
12+
- '.github/workflows/common.yml'
13+
- '.github/workflows/common_cocoapods.yml'
14+
- '.github/workflows/common_catalyst.yml'
915
- 'Gemfile*'
1016
schedule:
1117
# Run every day at 10pm (PST) - cron uses UTC times
@@ -28,46 +34,18 @@ jobs:
2834
product: FirebaseInstallations
2935
target: FirebaseInstallations-Unit-unit
3036

31-
pod-lib-lint:
32-
# Don't run on private repo unless it is a PR.
33-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
34-
35-
env:
36-
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
37-
strategy:
38-
matrix:
39-
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
40-
target: [ios, tvos, macos --skip-tests, watchos]
41-
build-env:
42-
- os: macos-14
43-
xcode: Xcode_16.2
44-
test-specs: unit,integration
45-
- os: macos-15
46-
xcode: Xcode_16.3
47-
test-specs: unit
48-
runs-on: ${{ matrix.build-env.os }}
49-
steps:
50-
- uses: actions/checkout@v4
51-
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
52-
- name: Setup Bundler
53-
run: scripts/setup_bundler.sh
54-
- name: Configure test keychain
55-
run: scripts/configure_test_keychain.sh
56-
- name: Install GoogleService-Info.plist
57-
run: |
37+
pod_lib_lint:
38+
uses: ./.github/workflows/common_cocoapods.yml
39+
with:
40+
product: FirebaseInstallations
41+
setup_command: |
42+
scripts/configure_test_keychain.sh
5843
mkdir -p FirebaseInstallations/Source/Tests/Resources
5944
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Installations/GoogleService-Info.plist.gpg \
6045
FirebaseInstallations/Source/Tests/Resources/GoogleService-Info.plist "$plist_secret"
61-
- name: Get boolean for secrets available
62-
id: secrets
63-
run: echo "::set-output name=val::$([[ -z $plist_secret ]] && echo "0" || echo "1")"
64-
- name: Xcode
65-
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
66-
- name: Build and test
67-
run: |
68-
export FIS_INTEGRATION_TESTS_REQUIRED=${{ steps.secrets.outputs.val }}
69-
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseInstallations.podspec \
70-
--platforms=${{ matrix.target }} --test-specs=${{ matrix.build-env.test-specs }}
46+
export FIS_INTEGRATION_TESTS_REQUIRED=1
47+
secrets:
48+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
7149

7250
quickstart:
7351
# Don't run on private repo unless it is a PR.
@@ -129,7 +107,7 @@ jobs:
129107
flags: [
130108
'--use-static-frameworks'
131109
]
132-
needs: pod-lib-lint
110+
needs: pod_lib_lint
133111
steps:
134112
- uses: actions/checkout@v4
135113
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1

.github/workflows/messaging.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ on:
1818
# Re-usable workflows being used by this file.
1919
- '.github/workflows/common.yml'
2020
# - '.github/workflows/common_cocoapods.yml'
21+
- '.github/workflows/common_catalyst.yml'
2122
# Rebuild on Ruby infrastructure changes
2223
- 'Gemfile*'
2324
schedule:

0 commit comments

Comments
 (0)