Skip to content

Commit 7f097af

Browse files
ncooke3ncooke3
authored
fixes
1 parent 148c1c6 commit 7f097af

File tree

2 files changed

+76
-85
lines changed

2 files changed

+76
-85
lines changed

‎.github/workflows/performance.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ jobs:
8686
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
8787

8888
quickstart-ftl-cron-only:
89-
# if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule'
90-
if: github.repository == 'Firebase/firebase-ios-sdk'
89+
if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule'
9190
env:
9291
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
9392
runs-on: macos-15
@@ -106,7 +105,7 @@ jobs:
106105
- name: Install xcpretty
107106
run: gem install xcpretty
108107
- name: Setup quickstart
109-
run: QUICKSTART_BRANCH=nc/bft-fix scripts/setup_quickstart_spm.sh performance
108+
run: scripts/setup_quickstart_spm.sh performance
110109
- name: Install Secret GoogleService-Info.plist
111110
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-performance.plist.gpg \
112111
quickstart-ios/performance/GoogleService-Info.plist "$plist_secret"

‎.github/workflows/storage.yml‎

Lines changed: 74 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -25,90 +25,82 @@ concurrency:
2525
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
2626
cancel-in-progress: true
2727

28-
#jobs:
29-
# spm:
30-
# uses: ./.github/workflows/common.yml
31-
# with:
32-
# target: FirebaseStorageUnit
33-
#
34-
# catalyst:
35-
# uses: ./.github/workflows/common_catalyst.yml
36-
# with:
37-
# product: FirebaseStorage
38-
# target: FirebaseStorage-Unit-unit
39-
#
40-
# storage-integration-tests:
41-
# # Don't run on private repo unless it is a PR.
42-
# if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
43-
# strategy:
44-
# matrix:
45-
# language: [Swift, ObjC]
46-
# include:
47-
# - os: macos-15
48-
# xcode: Xcode_16.4
49-
# env:
50-
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
51-
# runs-on: ${{ matrix.os }}
52-
# steps:
53-
# - uses: actions/checkout@v4
54-
# - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
55-
# with:
56-
# cache_key: integration${{ matrix.os }}
57-
# - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
58-
# - name: Setup Bundler
59-
# run: scripts/setup_bundler.sh
60-
# - name: Install xcpretty
61-
# run: gem install xcpretty
62-
# - name: Install Secret GoogleService-Info.plist
63-
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/storage-db-plist.gpg \
64-
# FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist "$plist_secret"
65-
# - name: Install Credentials.h
66-
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.h.gpg \
67-
# FirebaseStorage/Tests/ObjCIntegration/Credentials.h "$plist_secret"
68-
# - name: Install Credentials.swift
69-
# run: |
70-
# scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.swift.gpg \
71-
# FirebaseStorage/Tests/Integration/Credentials.swift "$plist_secret"
72-
# - name: Xcode
73-
# run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
74-
# - uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
75-
# with:
76-
# timeout_minutes: 15
77-
# max_attempts: 3
78-
# retry_wait_seconds: 120
79-
# command: ([ -z $plist_secret ] || scripts/build.sh Storage${{ matrix.language }} all)
80-
#
81-
# quickstart:
82-
# # TODO: See #12399 and restore Objective-C testing for Xcode 15 if GHA is fixed.
83-
# uses: ./.github/workflows/common_quickstart.yml
84-
# with:
85-
# product: Storage
86-
# setup_command: scripts/setup_quickstart_spm.sh storage
87-
# plist_src_path: scripts/gha-encrypted/qs-storage.plist.gpg
88-
# plist_dst_path: quickstart-ios/storage/GoogleService-Info.plist
89-
# run_tests: false
90-
# secrets:
91-
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
92-
9328
jobs:
94-
quickstart-ftl-cron-only:
95-
# Don't run on private repo.
96-
if: github.repository == 'Firebase/firebase-ios-sdk'
29+
spm:
30+
uses: ./.github/workflows/common.yml
31+
with:
32+
target: FirebaseStorageUnit
33+
34+
catalyst:
35+
uses: ./.github/workflows/common_catalyst.yml
36+
with:
37+
product: FirebaseStorage
38+
target: FirebaseStorage-Unit-unit
39+
40+
storage-integration-tests:
41+
# Don't run on private repo unless it is a PR.
42+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
43+
strategy:
44+
matrix:
45+
language: [Swift, ObjC]
46+
include:
47+
- os: macos-15
48+
xcode: Xcode_16.4
9749
env:
9850
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
99-
runs-on: macos-15
51+
runs-on: ${{ matrix.os }}
10052
steps:
10153
- uses: actions/checkout@v4
10254
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
10355
- name: Setup Bundler
10456
run: scripts/setup_bundler.sh
10557
- name: Install xcpretty
10658
run: gem install xcpretty
59+
- name: Install Secret GoogleService-Info.plist
60+
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/storage-db-plist.gpg \
61+
FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist "$plist_secret"
62+
- name: Install Credentials.h
63+
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.h.gpg \
64+
FirebaseStorage/Tests/ObjCIntegration/Credentials.h "$plist_secret"
65+
- name: Install Credentials.swift
66+
run: |
67+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.swift.gpg \
68+
FirebaseStorage/Tests/Integration/Credentials.swift "$plist_secret"
69+
- name: Xcode
70+
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
71+
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
72+
with:
73+
timeout_minutes: 15
74+
max_attempts: 3
75+
retry_wait_seconds: 120
76+
command: ([ -z $plist_secret ] || scripts/build.sh Storage${{ matrix.language }} all)
77+
78+
quickstart:
79+
# TODO: See #12399 and restore Objective-C testing for Xcode 15 if GHA is fixed.
80+
uses: ./.github/workflows/common_quickstart.yml
81+
with:
82+
product: Storage
83+
setup_command: scripts/setup_quickstart_spm.sh storage
84+
plist_src_path: scripts/gha-encrypted/qs-storage.plist.gpg
85+
plist_dst_path: quickstart-ios/storage/GoogleService-Info.plist
86+
run_tests: false
87+
secrets:
88+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
89+
90+
quickstart-ftl-cron-only:
91+
# Don't run on private repo.
92+
if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule'
93+
env:
94+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
95+
runs-on: macos-15
96+
steps:
97+
- uses: actions/checkout@v4
98+
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
10799
- uses: actions/setup-python@v5
108100
with:
109101
python-version: '3.11'
110102
- name: Setup quickstart
111-
run: QUICKSTART_BRANCH=nc/bft-fix scripts/setup_quickstart_spm.sh storage
103+
run: scripts/setup_quickstart.sh storage
112104
- name: Install Secret GoogleService-Info.plist
113105
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \
114106
quickstart-ios/storage/GoogleService-Info.plist "$plist_secret"
@@ -123,16 +115,16 @@ jobs:
123115
testapp_dir: quickstart-ios/build-for-testing
124116
test_type: "xctest"
125117

126-
# pod_lib_lint:
127-
# uses: ./.github/workflows/common_cocoapods.yml
128-
# with:
129-
# product: FirebaseStorage
130-
# test_specs: unit
118+
pod_lib_lint:
119+
uses: ./.github/workflows/common_cocoapods.yml
120+
with:
121+
product: FirebaseStorage
122+
test_specs: unit
131123

132-
# storage-cron-only:
133-
# needs: pod_lib_lint
134-
# uses: ./.github/workflows/common_cocoapods_cron.yml
135-
# with:
136-
# product: FirebaseStorage
137-
# platforms: '[ "ios", "tvos", "macos", "watchos" ]'
138-
# flags: '[ "--use-static-frameworks --skip-tests" ]'
124+
storage-cron-only:
125+
needs: pod_lib_lint
126+
uses: ./.github/workflows/common_cocoapods_cron.yml
127+
with:
128+
product: FirebaseStorage
129+
platforms: '[ "ios", "tvos", "macos", "watchos" ]'
130+
flags: '[ "--use-static-frameworks --skip-tests" ]'

0 commit comments

Comments
 (0)