Skip to content

Commit aeb934d

Browse files
committed
Merge branch 'main' into nc/quickstarts
2 parents c8517c4 + 1a9c17d commit aeb934d

File tree

5 files changed

+22
-9
lines changed

5 files changed

+22
-9
lines changed

.github/workflows/firebaseai.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ jobs:
3636
setup_command: scripts/update_vertexai_responses.sh
3737

3838
testapp-integration:
39+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
3940
strategy:
4041
matrix:
4142
target: [iOS]
@@ -90,6 +91,7 @@ jobs:
9091
setup_command: scripts/update_vertexai_responses.sh
9192

9293
quickstart:
94+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
9395
strategy:
9496
matrix:
9597
include:

.github/workflows/prerelease_cocoapods.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,3 +214,4 @@ jobs:
214214
swift build
215215
pod repo add --silent "${local_repo}" https://"$botaccess"@github.com/Firebase/SpecsTesting.git
216216
BOT_TOKEN="${botaccess}" .build/debug/spec-repo-builder --sdk-repo $(pwd) --local-spec-repo-name "${local_repo}" --sdk-repo-name SpecsTesting --github-account Firebase --pod-sources 'https://${BOT_TOKEN}@github.com/Firebase/SpecsTesting' "https://github.com/firebase/SpecsDev.git" "https://github.com/firebase/SpecsStaging.git" "https://cdn.cocoapods.org/" "FirebaseFirestoreTestingSupport" "FirebaseAuthTestingSupport" "FirebaseCombineSwift" --keep-repo --include-pods "${updated_podspecs[@]}"
217+

FirebaseAI/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
1+
# 12.6.0
2+
- [feature] Added support for
3+
[Server Prompt Templates](https://firebase.google.com/docs/ai-logic/server-prompt-templates/get-started).
4+
15
# 12.5.0
6+
- [changed] Renamed the `FirebaseAI` module to `FirebaseAILogic`. This is a non-breaking change.
7+
`FirebaseAI` references will continue to work until a future breaking change release. Going
8+
forward, imports should be changed to `import FirebaseAILogic` and the `FirebaseAILogic` Swift
9+
Package dependency should be selected. See the
10+
[Swift module name change](https://firebase.google.com/docs/ai-logic/faq-and-troubleshooting#swift-module-name-change)
11+
FAQ entry for more details.
212
- [fixed] Fixed a nanoseconds parsing issue in the Live API when receiving a
313
`LiveServerGoingAwayNotice` message. (#15410)
414
- [feature] Added support for sending video frames with the Live API via the `sendVideoRealtime`

docs/ContinuousIntegration.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ The release workflow is to test podspecs corresponding to the latest release tag
7878
create a CocoaPods spec testing repo. Podspecs in this testing repo
7979
will have tags `Cocoapods-X.Y.Z`. This is to mimic a real released candidate.
8080

81-
#### Prerelease workflow
82-
[prerelease.yml](https://github.com/firebase/firebase-ios-sdk/tree/main/.github/workflows/prerelease.yml)
81+
#### Prerelease cocoapods workflow
82+
[prerelease_cocoapods.yml](https://github.com/firebase/firebase-ios-sdk/tree/main/.github/workflows/prerelease_cocoapods.yml)
8383

84-
The prerelease workflow is to test podspecs on the `main` branch, and create a testing repo. This is
84+
The prerelease_cocoapods workflow is to test podspecs on the `main` branch, and create a testing repo. This is
8585
to make sure podspecs are releasable, which means podspecs in the head can pass all tests and build
8686
up a candidate.
8787

@@ -100,11 +100,11 @@ in the SDK repo. A job to run `pod spec lint` is added to SDK testing workflows,
100100
Analytics, Auth, Core, Crashlytics, Database, Firestore, Functions, GoogleUtilities,
101101
InAppMessaging, Installations, Messaging, MLModelDownloader, Performance, RemoteConfig and Storage.
102102
These jobs will be triggered in presubmit and run pod spec lint with a source of
103-
Firebase/SpecsTesting repo, which is updated to the head of main nightly in the prerelease
103+
Firebase/SpecsTesting repo, which is updated to the head of main nightly in the prerelease_cocoapods
104104
workflow.
105105

106106
When these PRs are merged, then changed podspecs will be pod repo push to the Firebase/SpecsTesting
107-
repo, through `update_SpecTesting_repo` job in the prerelease workflow, to make sure the podspec
107+
repo, through `update_SpecTesting_repo` job in the prerelease_cocoapods workflow, to make sure the podspec
108108
repo is up-to-date.
109109

110110
### Daily Test Status Notification

scripts/create_spec_repo/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ with sources of
1111
where [SpecsTesting](https://github.com/firebase/SpecsTesting) is generated from the head of the
1212
main branch of [firebase-ios-sdk repo](https://github.com/firebase/firebase-ios-sdk).
1313

14-
The [prerelease workflow](https://github.com/firebase/firebase-ios-sdk/blob/main/.github/workflows/prerelease.yml#L11-L46)
14+
The [prerelease_cocoapods workflow](https://github.com/firebase/firebase-ios-sdk/blob/main/.github/workflows/prerelease_cocoapods.yml#L11-L46)
1515
will update the [SpecsTesting repo](https://github.com/firebase/SpecsTesting) nightly from the
1616
head of the main branch.
1717
In order to let presubmit tests run on the latest podspec repo, [SpecsTesting repo](https://github.com/firebase/SpecsTesting)
1818
will be updated when a PR with changed podspecs is merged.
1919
When this PR is merged, changed podspecs will be `pod repo push`ed to the podspec repo in
20-
[postsubmit tests](https://github.com/firebase/firebase-ios-sdk/blob/main/.github/workflows/prerelease.yml#L48-L94).
20+
[postsubmit tests](https://github.com/firebase/firebase-ios-sdk/blob/main/.github/workflows/prerelease_cocoapods.yml#L48-L94).
2121

2222
Since `pod spec lint` will test podspecs with remote sources. One PR with changes on multiple
2323
podspecs are not encouraged. Changes with multiple podspecs, including their dependencies, might
@@ -46,6 +46,6 @@ job in presubmit.
4646
4747
```
4848

49-
Once a PR is merged, [`update_SpecsTesting_repo` job](https://github.com/firebase/firebase-ios-sdk/blob/main/.github/workflows/prerelease.yml#L48)
50-
in the [prerelease workflow](https://github.com/firebase/firebase-ios-sdk/blob/main/.github/workflows/prerelease.yml)
49+
Once a PR is merged, [`update_SpecsTesting_repo` job](https://github.com/firebase/firebase-ios-sdk/blob/main/.github/workflows/prerelease_cocoapods.yml#L48)
50+
in the [prerelease_cocoapods workflow](https://github.com/firebase/firebase-ios-sdk/blob/main/.github/workflows/prerelease_cocoapods.yml)
5151
will automatically `pod repo push` changed podspecs in postsubmits,

0 commit comments

Comments
 (0)