Skip to content

Commit 7999ab4

Browse files
tom-andersendavidmotsonDavid MotsonashvilirlazoFry-kun
authored
Merge main (#7016)
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: David Motsonashvili <[email protected]> Co-authored-by: David Motsonashvili <[email protected]> Co-authored-by: Rodrigo Lazo <[email protected]> Co-authored-by: Konstantin Svist <[email protected]> Co-authored-by: Matthew Robertson <[email protected]> Co-authored-by: Daymon <[email protected]> Co-authored-by: Lee Kellogg <[email protected]> Co-authored-by: Tushar Khandelwal <[email protected]> Co-authored-by: emilypgoogle <[email protected]> Co-authored-by: Denver Coneybeare <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mila <[email protected]> Co-authored-by: welishr <[email protected]> Co-authored-by: mustafa jadid <[email protected]> Co-authored-by: Google Open Source Bot <[email protected]> Co-authored-by: VinayGuthal <[email protected]> Co-authored-by: VinayGuthal <[email protected]> Co-authored-by: Andrew Heard <[email protected]> Co-authored-by: google-labs-jules[bot] <161369871+google-labs-jules[bot]@users.noreply.github.com> Co-authored-by: Rodrigo Lazo Paz <[email protected]> Co-authored-by: Kai Bolay <[email protected]> Co-authored-by: Rosário P. Fernandes <[email protected]> Co-authored-by: emilypgoogle <[email protected]> Co-authored-by: Andrew Heard <[email protected]> Co-authored-by: Tejas Deshpande <[email protected]> Co-authored-by: rlazo <[email protected]> Co-authored-by: rachelsaunders <[email protected]> Co-authored-by: Ehsan <[email protected]> Co-authored-by: Angel Leon <[email protected]> Co-authored-by: themiswang <[email protected]> Co-authored-by: Michael Hoisie <[email protected]> Co-authored-by: Greg Sakakihara <[email protected]> Co-authored-by: Tejas Deshpande <[email protected]>
1 parent 95bbf92 commit 7999ab4

File tree

457 files changed

+23270
-4746
lines changed

Some content is hidden

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

457 files changed

+23270
-4746
lines changed

‎.github/actions/dataconnect-send-notifications/action.yml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
name: Data Connect Workflow Notifications
2+
description: Notify a GitHub Issue with the results of a workflow.
3+
4+
inputs:
5+
python-version:
6+
required: true
7+
default: "3.13"
8+
github-issue-for-scheduled-runs:
9+
required: true
10+
job-results-file:
11+
required: true
12+
13+
runs:
14+
using: "composite"
15+
steps:
16+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
17+
with:
18+
python-version: ${{ inputs.python-version }}
19+
20+
- run: pip install -r requirements.txt
21+
shell: bash
22+
working-directory: firebase-dataconnect/ci
23+
24+
- id: issue-id
25+
name: Determine GitHub Issue For Commenting
26+
working-directory: firebase-dataconnect/ci
27+
shell: bash
28+
run: |
29+
args=(
30+
python
31+
calculate_github_issue_for_commenting.py
32+
--issue-output-file=github_issue_number.txt
33+
--github-repository='${{ github.repository }}'
34+
--github-ref='${{ github.ref }}'
35+
--github-event-name='${{ github.event_name }}'
36+
--pr-body-github-issue-key=trksmnkncd_notification_issue
37+
--github-issue-for-scheduled-run='${{ inputs.github-issue-for-scheduled-runs }}'
38+
)
39+
echo "${args[*]}"
40+
"${args[@]}"
41+
42+
set -xv
43+
issue="$(cat github_issue_number.txt)"
44+
echo "issue=$issue" >> "$GITHUB_OUTPUT"
45+
46+
- name: Post Comment on GitHub Issue
47+
if: steps.issue-id.outputs.issue != ''
48+
working-directory: firebase-dataconnect/ci
49+
shell: bash
50+
run: |
51+
args=(
52+
python
53+
post_comment_for_job_results.py
54+
--github-issue='${{ steps.issue-id.outputs.issue }}'
55+
--github-workflow='${{ github.workflow }}'
56+
--github-repository='${{ github.repository }}'
57+
--github-ref='${{ github.ref }}'
58+
--github-event-name='${{ github.event_name }}'
59+
--github-sha='${{ github.sha }}'
60+
--github-repository-html-url='${{ github.event.repository.html_url }}'
61+
--github-run-id='${{ github.run_id }}'
62+
--github-run-number='${{ github.run_number }}'
63+
--github-run-attempt='${{ github.run_attempt }}'
64+
)
65+
66+
while read -r line; do
67+
args=("${args[@]}" "$line")
68+
done <'${{ inputs.job-results-file }}'
69+
70+
echo "${args[*]}"
71+
exec "${args[@]}"

‎.github/workflows/api-information.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,18 @@ jobs:
77
if: github.event.pull_request.head.repo.full_name == github.repository
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v4.1.1
10+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1111
with:
1212
fetch-depth: 2
1313
submodules: true
1414
- name: Set up JDK 17
15-
uses: actions/setup-java@v4.1.0
15+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
1616
with:
1717
java-version: 17
1818
distribution: temurin
1919
cache: gradle
2020
- name: Set up Python 3.10
21-
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
21+
uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
2222
with:
2323
python-version: '3.10'
2424
- name: Set up fireci

‎.github/workflows/build-release-artifacts.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
env:
1313
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1414
steps:
15-
- uses: actions/checkout@v4.1.1
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616

1717
- name: Set up JDK 17
18-
uses: actions/setup-java@v4.1.0
18+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
1919
with:
2020
java-version: 17
2121
distribution: temurin
@@ -26,21 +26,21 @@ jobs:
2626
./gradlew firebasePublish
2727
2828
- name: Upload m2 repo
29-
uses: actions/upload-artifact@v4.3.3
29+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
3030
with:
3131
name: m2repository
3232
path: build/m2repository/
3333
retention-days: 15
3434

3535
- name: Upload release notes
36-
uses: actions/upload-artifact@v4.3.3
36+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
3737
with:
3838
name: release_notes
3939
path: build/release-notes/
4040
retention-days: 15
4141

4242
- name: Upload kotlindocs
43-
uses: actions/upload-artifact@v4.3.3
43+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
4444
with:
4545
name: kotlindocs
4646
path: build/firebase-kotlindoc/

‎.github/workflows/changelog.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
env:
1414
BUNDLE_GEMFILE: ./ci/danger/Gemfile
1515
steps:
16-
- uses: actions/checkout@v4.1.1
16+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1717
with:
1818
fetch-depth: 100
1919
submodules: true
20-
- uses: ruby/setup-ruby@v1
20+
- uses: ruby/setup-ruby@1a615958ad9d422dd932dc1d5823942ee002799f # v1.227.0
2121
with:
2222
ruby-version: '2.7'
2323
- name: Setup Bundler

‎.github/workflows/check-vertexai-responses.yml‎ renamed to ‎.github/workflows/check-firebaseai-responses.yml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,42 @@
1-
name: Check Vertex AI Responses
1+
name: Check Firebase AI Responses
22

33
on: pull_request
44

55
jobs:
66
check-version:
77
runs-on: ubuntu-latest
8+
permissions:
9+
pull-requests: write
810
steps:
9-
- uses: actions/checkout@v4
11+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1012
- name: Clone mock responses
11-
run: firebase-vertexai/update_responses.sh
13+
run: firebase-ai/update_responses.sh
1214
- name: Find cloned and latest versions
1315
run: |
1416
CLONED=$(git describe --tags)
1517
LATEST=$(git tag --sort=v:refname | tail -n1)
1618
echo "cloned_tag=$CLONED" >> $GITHUB_ENV
1719
echo "latest_tag=$LATEST" >> $GITHUB_ENV
18-
working-directory: firebase-vertexai/src/test/resources/vertexai-sdk-test-data
20+
working-directory: firebase-ai/src/test/resources/vertexai-sdk-test-data
1921
- name: Find comment from previous run if exists
20-
uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e
22+
uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3.1.0
2123
id: fc
2224
with:
2325
issue-number: ${{github.event.number}}
24-
body-includes: Vertex AI Mock Responses Check
26+
body-includes: Firebase AI Mock Responses Check
2527
- name: Comment on PR if newer version is available
2628
if: ${{env.cloned_tag != env.latest_tag && !steps.fc.outputs.comment-id}}
27-
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043
29+
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4.0.0
2830
with:
2931
issue-number: ${{github.event.number}}
3032
body: >
31-
### Vertex AI Mock Responses Check :warning:
32-
33-
A newer major version of the mock responses for Vertex AI unit tests is available.
34-
[update_responses.sh](https://github.com/firebase/firebase-android-sdk/blob/main/firebase-vertexai/update_responses.sh)
33+
### Firebase AI Mock Responses Check :warning:
34+
35+
A newer major version of the mock responses for Firebase AI unit tests is available.
36+
[update_responses.sh](https://github.com/firebase/firebase-android-sdk/blob/main/firebase-ai/update_responses.sh)
3537
should be updated to clone the latest version of the responses: `${{env.latest_tag}}`
3638
- name: Delete comment when version gets updated
3739
if: ${{env.cloned_tag == env.latest_tag && steps.fc.outputs.comment-id}}
38-
uses: detomarco/delete-comment@850734dd44d8b15fef55b45252613b903ceb06f0
40+
uses: detomarco/delete-comment@dd37d1026c669ebfb0ffa5d23890010759ff05d5 # v1.1.0
3941
with:
4042
comment-id: ${{ steps.fc.outputs.comment-id }}

‎.github/workflows/check-head-dependencies.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ jobs:
1010
check-head-dependencies:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v4.1.1
13+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1414
- name: Set up JDK 17
15-
uses: actions/setup-java@v4.1.0
15+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
1616
with:
1717
java-version: 17
1818
distribution: temurin

‎.github/workflows/check_format.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
outputs:
1717
modules: ${{ steps.changed-modules.outputs.modules }}
1818
steps:
19-
- uses: actions/checkout@v4.1.1
19+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
with:
2121
fetch-depth: 2
2222
submodules: true
2323

2424
- name: Set up JDK 17
25-
uses: actions/setup-java@v4.1.0
25+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
2626
with:
2727
java-version: 17
2828
distribution: temurin
@@ -44,13 +44,13 @@ jobs:
4444
module: ${{ fromJSON(needs.determine_changed.outputs.modules) }}
4545

4646
steps:
47-
- uses: actions/checkout@v4.1.1
47+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4848
with:
4949
fetch-depth: 2
5050
submodules: true
5151

5252
- name: Set up JDK 17
53-
uses: actions/setup-java@v4.1.0
53+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
5454
with:
5555
java-version: 17
5656
distribution: temurin

‎.github/workflows/ci_tests.yml‎

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
outputs:
1717
modules: ${{ steps.changed-modules.outputs.modules }}
1818
steps:
19-
- uses: actions/checkout@v4.1.1
19+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2020
with:
2121
fetch-depth: 2
2222
submodules: true
2323

2424
- name: Set up JDK 17
25-
uses: actions/setup-java@v4.1.0
25+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
2626
with:
2727
java-version: 17
2828
distribution: temurin
@@ -44,30 +44,25 @@ jobs:
4444
module: ${{ fromJSON(needs.determine_changed.outputs.modules) }}
4545

4646
steps:
47-
- uses: actions/checkout@v4.1.1
47+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
4848
with:
4949
fetch-depth: 2
5050
submodules: true
5151

5252
- name: Set up JDK 17
53-
uses: actions/setup-java@v4.1.0
53+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
5454
with:
5555
java-version: 17
5656
distribution: temurin
5757
cache: gradle
5858

59-
- name: Pull genai-common
59+
- name: Clone vertexai mock responses
6060
if: matrix.module == ':firebase-vertexai'
61-
run: |
62-
git clone https://github.com/google-gemini/generative-ai-android.git
63-
cd generative-ai-android
64-
./gradlew :common:updateVersion common:publishToMavenLocal
65-
cd ..
61+
run: firebase-vertexai/update_responses.sh
6662

67-
- name: Clone mock responses
68-
if: matrix.module == ':firebase-vertexai'
69-
run: |
70-
firebase-vertexai/update_responses.sh
63+
- name: Clone ai mock responses
64+
if: matrix.module == ':firebase-ai'
65+
run: firebase-ai/update_responses.sh
7166

7267
- name: Add google-services.json
7368
env:
@@ -85,7 +80,7 @@ jobs:
8580
MODULE=${{matrix.module}}
8681
echo "ARTIFACT_NAME=${MODULE//:/_}" >> $GITHUB_ENV
8782
- name: Upload Test Results
88-
uses: actions/upload-artifact@v4.3.3
83+
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
8984
if: always()
9085
with:
9186
name: unit-test-result-${{env.ARTIFACT_NAME}}
@@ -122,13 +117,13 @@ jobs:
122117
- module: :firebase-functions:ktx
123118

124119
steps:
125-
- uses: actions/checkout@v4.1.1
120+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
126121
with:
127122
fetch-depth: 2
128123
submodules: true
129124

130125
- name: Set up JDK 17
131-
uses: actions/setup-java@v4.1.0
126+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
132127
with:
133128
java-version: 17
134129
distribution: temurin
@@ -139,10 +134,10 @@ jobs:
139134
INTEG_TESTS_GOOGLE_SERVICES: ${{ secrets.INTEG_TESTS_GOOGLE_SERVICES }}
140135
run: |
141136
echo $INTEG_TESTS_GOOGLE_SERVICES | base64 -d > google-services.json
142-
- uses: google-github-actions/auth@v2
137+
- uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
143138
with:
144139
credentials_json: ${{ secrets.GCP_SERVICE_ACCOUNT }}
145-
- uses: google-github-actions/setup-gcloud@v2
140+
- uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
146141
- name: ${{ matrix.module }} Integ Tests
147142
env:
148143
FIREBASE_CI: 1
@@ -168,11 +163,11 @@ jobs:
168163

169164
steps:
170165
- name: Download Artifacts
171-
uses: actions/download-artifact@v4.1.7
166+
uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1
172167
with:
173168
path: artifacts
174169

175170
- name: Publish Test Results
176-
uses: EnricoMi/publish-unit-test-result-action@82082dac68ad6a19d980f8ce817e108b9f496c2a
171+
uses: EnricoMi/publish-unit-test-result-action@170bf24d20d201b842d7a52403b73ed297e6645b # v2.18.0
177172
with:
178173
files: "artifacts/**/*.xml"

‎.github/workflows/config-e2e.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818

1919
steps:
2020
- name: Checkout firebase-config
21-
uses: actions/checkout@v4.1.1
21+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2222

2323
- name: set up JDK 17
24-
uses: actions/setup-java@v4.1.0
24+
uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
2525
with:
2626
java-version: '17'
2727
distribution: 'temurin'
@@ -31,10 +31,10 @@ jobs:
3131
run: |
3232
echo $REMOTE_CONFIG_E2E_GOOGLE_SERVICES | base64 -d > google-services.json
3333
34-
- uses: google-github-actions/auth@v2
34+
- uses: google-github-actions/auth@71f986410dfbc7added4569d411d040a91dc6935 # v2.1.8
3535
with:
3636
credentials_json: ${{ secrets.GCP_service_account }}
37-
- uses: google-github-actions/setup-gcloud@v2
37+
- uses: google-github-actions/setup-gcloud@77e7a554d41e2ee56fc945c52dfd3f33d12def9a # v2.1.4
3838
- name: Run Remote Config end-to-end tests
3939
env:
4040
FTL_RESULTS_BUCKET: fireescape

‎.github/workflows/copyright-check.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
copyright-check:
1111
runs-on: ubuntu-22.04
1212
steps:
13-
- uses: actions/checkout@v4.1.1
14-
- uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3
13+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
14+
- uses: actions/setup-python@42375524e23c412d93fb67b49958b491fce71c38 # v5.4.0
1515
with:
1616
python-version: '3.9'
1717
- run: |

0 commit comments

Comments
 (0)