Skip to content

Commit f2ca1ae

Browse files
committed
Merge remote-tracking branch 'origin/main' into ah/ai-integration-test-building
2 parents d30c20f + 07bdccf commit f2ca1ae

File tree

66 files changed

+648
-324
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+648
-324
lines changed

.github/workflows/common_quickstart.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,17 @@ jobs:
100100
${{ inputs.quickstart_type }}
101101
# Failure sequence to upload artifact.
102102
- id: lowercase_product
103-
if: ${{ failure() }}
103+
if: failure()
104104
run: |
105105
lowercase_product=$(echo "${{ inputs.product }}" | tr '[:upper:]' '[:lower:]')
106106
echo "lowercase_product=$lowercase_product" >> $GITHUB_OUTPUT
107107
- name: Remove data before upload.
108-
if: ${{ failure() }}
108+
if: failure()
109109
run: scripts/remove_data.sh ${{ steps.lowercase_product.outputs.lowercase_product }}
110110
- uses: actions/upload-artifact@v4
111-
if: ${{ failure() }}
111+
if: failure()
112112
with:
113113
name: quickstart_artifacts_${{ steps.lowercase_product.outputs.lowercase_product }}
114-
path: quickstart-ios/
114+
path: |
115+
quickstart-ios/
116+
!quickstart-ios/**/GoogleService-Info.plist

.github/workflows/crashlytics.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ on:
1818
- 'Interop/Analytics/Public/*.h'
1919
- 'Gemfile*'
2020
schedule:
21-
# Run every day at 7pm (PDT) / 10pm (EDT) - cron uses UTC times
22-
- cron: '0 2 * * *'
21+
# Run every day at 11pm (PDT) / 2am (EDT) - cron uses UTC times
22+
- cron: '0 6 * * *'
2323

2424
concurrency:
2525
group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}

.github/workflows/firebaseai.yml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,15 @@ jobs:
3737
setup_command: scripts/update_vertexai_responses.sh
3838

3939
testapp-integration:
40+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
4041
strategy:
4142
matrix:
42-
target: [iOS]
43-
os: [macos-15]
4443
include:
4544
- os: macos-15
45+
target: iOS
4646
xcode: Xcode_16.4
4747
- os: macos-26
48+
target: iOS
4849
xcode: Xcode_26.0
4950
runs-on: ${{ matrix.os }}
5051
needs: spm
@@ -59,19 +60,8 @@ jobs:
5960
with:
6061
path: .build
6162
key: ${{ needs.spm.outputs.cache_key }}
62-
- name: Install Secret GoogleService-Info.plist
63-
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/FirebaseAI/TestApp-GoogleService-Info.plist.gpg \
64-
FirebaseAI/Tests/TestApp/Resources/GoogleService-Info.plist "$secrets_passphrase"
65-
- name: Install Secret GoogleService-Info-Spark.plist
66-
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/FirebaseAI/TestApp-GoogleService-Info-Spark.plist.gpg \
67-
FirebaseAI/Tests/TestApp/Resources/GoogleService-Info-Spark.plist "$secrets_passphrase"
68-
- name: Install Secret Credentials.swift
69-
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/FirebaseAI/TestApp-Credentials.swift.gpg \
70-
FirebaseAI/Tests/TestApp/Tests/Integration/Credentials.swift "$secrets_passphrase"
71-
- name: Xcode
72-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
73-
- name: Run IntegrationTests
74-
run: scripts/build.sh FirebaseAIIntegration ${{ matrix.target }}
63+
- name: Run integration tests
64+
run: scripts/repo.sh tests run --secrets ./scripts/secrets/AI.json --platforms ${{ matrix.target }} --xcode ${{ matrix.xcode }} AI
7565
- name: Upload xcodebuild logs
7666
if: failure()
7767
uses: actions/upload-artifact@v4
@@ -91,6 +81,7 @@ jobs:
9181
setup_command: scripts/update_vertexai_responses.sh
9282

9383
quickstart:
84+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
9485
strategy:
9586
matrix:
9687
include:

.github/workflows/prerelease.yml renamed to .github/workflows/prerelease_cocoapods.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: prerelease
1+
name: prerelease_cocoapods
22

33
permissions:
44
contents: write
@@ -8,7 +8,7 @@ on:
88
# closed will be triggered when a pull request is merged. This is to keep https://github.com/firebase/SpecsTesting up to date.
99
types: [closed]
1010
paths:
11-
- '.github/workflows/prerelease.yml'
11+
- '.github/workflows/prerelease_cocoapods.yml'
1212
workflow_dispatch:
1313
schedule:
1414
# Run every day at 10pm (PDT) / 1am (EDT) - cron uses UTC times
@@ -36,7 +36,7 @@ jobs:
3636
- name: Checkout code
3737
uses: actions/checkout@v4
3838
with:
39-
fetch-depth: 0
39+
fetch-depth: 0 # Required for pulling down repo tags.
4040
- name: Xcode
4141
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
4242
- name: Generate matrix
@@ -181,7 +181,7 @@ jobs:
181181
steps:
182182
- uses: actions/checkout@v4
183183
with:
184-
fetch-depth: 0
184+
fetch-depth: 0 # Required for pulling down repo tags.
185185
- name: Xcode
186186
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
187187
- name: Update SpecsTesting repo setup
@@ -340,10 +340,12 @@ jobs:
340340
command: scripts/test_quickstart.sh ${{ matrix.product }} ${{ matrix.run_tests }}
341341
# Failure sequence to upload artifact.
342342
- name: Remove data before upload.
343-
if: ${{ failure() }}
343+
if: failure()
344344
run: scripts/remove_data.sh ${{ matrix.product }}
345345
- uses: actions/upload-artifact@v4
346-
if: ${{ failure() }}
346+
if: failure()
347347
with:
348348
name: quickstart_artifacts_${{ matrix.product }}
349-
path: quickstart-ios/
349+
path: |
350+
quickstart-ios/
351+
!quickstart-ios/**/GoogleService-Info.plist
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: release
1+
name: release_cocoapods
22

33
permissions:
44
contents: read
@@ -7,7 +7,7 @@ on:
77
pull_request:
88
paths:
99
- 'scripts/release_testing_setup.sh'
10-
- '.github/workflows/release.yml'
10+
- '.github/workflows/release_cocoapods.yml'
1111
- 'Gemfile*'
1212
workflow_dispatch:
1313
schedule:
@@ -36,7 +36,7 @@ jobs:
3636
- name: Checkout code
3737
uses: actions/checkout@v4
3838
with:
39-
fetch-depth: 0
39+
fetch-depth: 0 # Required for pulling down repo tags.
4040
- name: Generate matrix
4141
id: generate_matrix
4242
run: |
@@ -237,13 +237,15 @@ jobs:
237237
retry_wait_seconds: 120
238238
command: scripts/test_quickstart.sh ${{ matrix.product }} ${{ matrix.run_tests }} swift
239239
- name: Remove data before upload
240-
if: ${{ failure() }}
240+
if: failure()
241241
run: scripts/remove_data.sh ${{ matrix.product }}
242242
- uses: actions/upload-artifact@v4
243-
if: ${{ failure() }}
243+
if: failure()
244244
with:
245245
name: quickstart_artifacts_${{ matrix.product }}
246-
path: quickstart-ios/
246+
path: |
247+
quickstart-ios/
248+
!quickstart-ios/**/GoogleService-Info.plist
247249
248250
# TODO: The functions quickstart uses Material which isn't supported by Xcode 15
249251
# functions_quickstart:

0 commit comments

Comments
 (0)