Skip to content

Commit a40d7de

Browse files
authored
Merge branch 'release-3.7' into cherry-pick-release-3.7-4257ca6f496e050441df83890da5883d570d1f7c
2 parents 49ff15b + ea57ff3 commit a40d7de

18 files changed

+43
-43
lines changed

.github/workflows/build-base-images.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767

6868
- name: Authenticate to Google Cloud
6969
id: auth
70-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
70+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
7171
with:
7272
token_format: access_token
7373
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -132,7 +132,7 @@ jobs:
132132

133133
- name: Authenticate to Google Cloud
134134
id: auth
135-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
135+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
136136
with:
137137
token_format: access_token
138138
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -195,7 +195,7 @@ jobs:
195195

196196
- name: Authenticate to Google Cloud
197197
id: auth
198-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
198+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
199199
with:
200200
token_format: access_token
201201
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}

.github/workflows/build-oss.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ jobs:
5959

6060
- name: Authenticate to Google Cloud
6161
id: auth
62-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
62+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
6363
with:
6464
token_format: access_token
6565
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}

.github/workflows/build-plus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161

6262
- name: Authenticate to Google Cloud
6363
id: auth
64-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
64+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
6565
with:
6666
token_format: access_token
6767
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}

.github/workflows/build-single-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363

6464
- name: Authenticate to Google Cloud
6565
id: auth
66-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
66+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
6767
with:
6868
token_format: access_token
6969
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}

.github/workflows/build-test-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Authenticate to Google Cloud
3737
id: auth
38-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
38+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
3939
with:
4040
token_format: access_token
4141
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127

128128
- name: Authenticate to Google Cloud
129129
id: auth
130-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
130+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
131131
with:
132132
token_format: access_token
133133
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -254,7 +254,7 @@ jobs:
254254
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
255255

256256
- name: Build binaries
257-
uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
257+
uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
258258
with:
259259
version: latest
260260
args: build --snapshot --clean
@@ -396,7 +396,7 @@ jobs:
396396

397397
- name: Authenticate to Google Cloud
398398
id: auth
399-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
399+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
400400
with:
401401
token_format: access_token
402402
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -530,7 +530,7 @@ jobs:
530530

531531
- name: Authenticate to Google Cloud
532532
id: auth
533-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
533+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
534534
with:
535535
token_format: access_token
536536
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070

7171
# Initializes the CodeQL tools for scanning.
7272
- name: Initialize CodeQL
73-
uses: github/codeql-action/init@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
73+
uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
7474
with:
7575
languages: ${{ matrix.language }}
7676
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -89,7 +89,7 @@ jobs:
8989
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
9090
# If this step fails, then you should remove it and run the build manually (see below)
9191
- name: Autobuild
92-
uses: github/codeql-action/autobuild@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
92+
uses: github/codeql-action/autobuild@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
9393

9494
# ℹ️ Command-line programs to run using the OS shell.
9595
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -102,6 +102,6 @@ jobs:
102102
# ./location_of_script_within_repo/buildscript.sh
103103

104104
- name: Perform CodeQL Analysis
105-
uses: github/codeql-action/analyze@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
105+
uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
106106
with:
107107
category: "/language:${{matrix.language}}"

.github/workflows/image-promotion.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080

8181
- name: Authenticate to Google Cloud
8282
id: auth
83-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
83+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
8484
with:
8585
token_format: access_token
8686
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -143,7 +143,7 @@ jobs:
143143
fi
144144
145145
- name: Upload SARIF file
146-
uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
146+
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
147147
if: steps.check-sarif.outputs.sarif_has_results == 'true'
148148
with:
149149
sarif_file: govulncheck.sarif
@@ -165,7 +165,7 @@ jobs:
165165
if: ${{ needs.checks.outputs.binary_cache_hit != 'true' }}
166166

167167
- name: Build binaries
168-
uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0
168+
uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
169169
with:
170170
version: latest
171171
args: build --snapshot --clean
@@ -419,7 +419,7 @@ jobs:
419419
420420
- name: Authenticate to Google Cloud
421421
id: auth
422-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
422+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
423423
with:
424424
token_format: access_token
425425
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -468,7 +468,7 @@ jobs:
468468
overwrite: true
469469

470470
- name: Upload Scan results to GitHub Security tab
471-
uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
471+
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
472472
with:
473473
sarif_file: "${{ steps.directory.outputs.directory }}/"
474474

@@ -509,7 +509,7 @@ jobs:
509509
510510
- name: Authenticate to Google Cloud
511511
id: auth
512-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
512+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
513513
with:
514514
token_format: access_token
515515
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -558,7 +558,7 @@ jobs:
558558
overwrite: true
559559

560560
- name: Upload Scan results to GitHub Security tab
561-
uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
561+
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
562562
with:
563563
sarif_file: "${{ steps.directory.outputs.directory }}/"
564564

@@ -606,7 +606,7 @@ jobs:
606606
607607
- name: Authenticate to Google Cloud
608608
id: auth
609-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
609+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
610610
with:
611611
token_format: access_token
612612
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -655,7 +655,7 @@ jobs:
655655
overwrite: true
656656

657657
- name: Upload Scan results to GitHub Security tab
658-
uses: github/codeql-action/upload-sarif@f779452ac5af1c261dce0346a8f964149f49322b # v3.26.13
658+
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
659659
with:
660660
sarif_file: "${{ steps.directory.outputs.directory }}/"
661661

.github/workflows/oss-release.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585

8686
- name: Authenticate to Google Cloud
8787
id: gcr-auth
88-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
88+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
8989
with:
9090
token_format: access_token
9191
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -123,7 +123,7 @@ jobs:
123123

124124
- name: Authenticate to Google Cloud
125125
id: gcr-auth
126-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
126+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
127127
with:
128128
token_format: access_token
129129
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -172,7 +172,7 @@ jobs:
172172

173173
- name: Authenticate to Google Cloud
174174
id: gcr-auth
175-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
175+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
176176
with:
177177
token_format: access_token
178178
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -216,7 +216,7 @@ jobs:
216216

217217
- name: Authenticate to Google Cloud
218218
id: gcr-auth
219-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
219+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
220220
with:
221221
token_format: access_token
222222
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}
@@ -262,7 +262,7 @@ jobs:
262262

263263
- name: Authenticate to Google Cloud
264264
id: gcr-auth
265-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
265+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
266266
with:
267267
token_format: access_token
268268
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}

.github/workflows/patch-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
- name: Authenticate to Google Cloud
5858
id: auth
59-
uses: google-github-actions/auth@8254fb75a33b976a221574d287e93919e6a36f70 # v2.1.6
59+
uses: google-github-actions/auth@6fc4af4b145ae7821d527454aa9bd537d1f2dc5f # v2.1.7
6060
with:
6161
token_format: access_token
6262
workload_identity_provider: ${{ secrets.GCR_WORKLOAD_IDENTITY }}

0 commit comments

Comments
 (0)