Skip to content

Commit 02f5121

Browse files
author
David Cavazos
authored
Merge branch 'main' into model-armor-sanitization-snippets
2 parents 5e2f8f9 + edf7782 commit 02f5121

File tree

4 files changed

+56
-28
lines changed

4 files changed

+56
-28
lines changed

‎.github/workflows/custard-ci-dev.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
4141
with:
4242
repository: GoogleCloudPlatform/cloud-samples-tools
43-
ref: v0.2.5
43+
ref: v0.3.2
4444
path: cloud-samples-tools
4545
- name: Create `bin` directory for cloud-samples-tools binaries
4646
run: mkdir bin

‎.github/workflows/custard-ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
4242
with:
4343
repository: GoogleCloudPlatform/cloud-samples-tools
44-
ref: v0.2.5
44+
ref: v0.3.2
4545
path: cloud-samples-tools
4646
- name: Create `bin` directory for cloud-samples-tools binaries
4747
run: mkdir bin

‎.github/workflows/custard-run-dev.yaml‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ on:
4545

4646
jobs:
4747
affected:
48-
uses: GoogleCloudPlatform/cloud-samples-tools/.github/workflows/affected.yaml@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
48+
uses: GoogleCloudPlatform/cloud-samples-tools/.github/workflows/affected.yaml@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
4949
permissions:
5050
statuses: write
5151
with:
@@ -70,26 +70,37 @@ jobs:
7070
continue-on-error: true
7171
env:
7272
GOOGLE_SAMPLES_PROJECT: long-door-651
73-
GOOGLE_SERVICE_ACCOUNT: [email protected]
73+
SERVICE_ACCOUNT: [email protected]
7474
steps:
7575
- name: Check queued
76-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/create-check@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
76+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/create-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
7777
id: queued
7878
with:
7979
sha: ${{ github.event.workflow_run.head_sha || inputs.ref || github.sha }}
8080
name: (experimental / dev) Custard CI / ${{ github.job }} (${{ matrix.path }})
8181
job-name: ${{ github.job }} (${{ matrix.path }})
8282
if: ${{ !!github.event.workflow_run }}
83+
- name: Checkout
84+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
85+
- name: Authenticate
86+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
87+
id: auth
88+
with:
89+
project_id: ${{ env.GOOGLE_SAMPLES_PROJECT }}
90+
workload_identity_provider: projects/1046198160504/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider
91+
service_account: ${{ env.SERVICE_ACCOUNT }}
92+
access_token_lifetime: 600s # 10 minutes
93+
token_format: id_token
94+
id_token_audience: https://action.test/ # service must have this custom audience
95+
id_token_include_email: true
8396
- name: Setup Custard
84-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/setup-custard@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
97+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/setup-custard@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
8598
with:
8699
path: ${{ matrix.path }}
87100
ci-setup: ${{ toJson(fromJson(needs.affected.outputs.ci-setups)[matrix.path]) }}
88-
project-id: ${{ env.GOOGLE_SAMPLES_PROJECT }}
89-
workload-identity-provider: projects/1046198160504/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider
90-
service-account: ${{ env.GOOGLE_SERVICE_ACCOUNT }}
101+
id-token: ${{ steps.auth.outputs.id_token }}
91102
- name: Check in_progress
92-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
103+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
93104
id: in_progress
94105
with:
95106
check: ${{ steps.queued.outputs.check }}
@@ -98,13 +109,16 @@ jobs:
98109
run: |
99110
timeout ${{ fromJson(needs.affected.outputs.ci-setups)[matrix.path].timeout-minutes }}m \
100111
make test dir=${{ matrix.path }}
112+
env:
113+
# TODO: remove this when the self-contained runner lands.
114+
SERVICE_ACCOUNT: [email protected]
101115
- name: Check success
102-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
116+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
103117
with:
104118
check: ${{ steps.in_progress.outputs.check }}
105119
status: success
106120
- name: Check failure
107-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
121+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
108122
if: failure()
109123
with:
110124
check: ${{ steps.in_progress.outputs.check }}
@@ -118,7 +132,7 @@ jobs:
118132
statuses: write
119133
steps:
120134
- name: Check success
121-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
135+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
122136
with:
123137
check: ${{ needs.affected.outputs.check }}
124138
status: success

‎.github/workflows/custard-run.yaml‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ on:
5050

5151
jobs:
5252
affected:
53-
uses: GoogleCloudPlatform/cloud-samples-tools/.github/workflows/affected.yaml@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
53+
uses: GoogleCloudPlatform/cloud-samples-tools/.github/workflows/affected.yaml@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
5454
permissions:
5555
statuses: write
5656
with:
@@ -68,7 +68,7 @@ jobs:
6868
timeout-minutes: 5
6969
steps:
7070
- name: Check in_progress
71-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/create-check@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
71+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/create-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
7272
id: in_progress
7373
with:
7474
sha: ${{ github.event.workflow_run.head_sha || inputs.ref || github.sha }}
@@ -83,17 +83,17 @@ jobs:
8383
node-version: 20
8484
- run: npm install
8585
- name: npx gtx lint (${{ needs.affected.outputs.num-paths }} packages)
86-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/map-run@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
86+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/map-run@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
8787
with:
8888
command: npx gts lint
8989
paths: ${{ needs.affected.outputs.paths }}
9090
- name: Check success
91-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
91+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
9292
with:
9393
check: ${{ steps.in_progress.outputs.check }}
9494
status: success
9595
- name: Check failure
96-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
96+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
9797
if: failure()
9898
with:
9999
check: ${{ steps.in_progress.outputs.check }}
@@ -114,26 +114,37 @@ jobs:
114114
continue-on-error: true
115115
env:
116116
GOOGLE_SAMPLES_PROJECT: long-door-651
117-
GOOGLE_SERVICE_ACCOUNT: [email protected]
117+
SERVICE_ACCOUNT: [email protected]
118118
steps:
119119
- name: Check queued
120-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/create-check@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
120+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/create-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
121121
id: queued
122122
with:
123123
sha: ${{ github.event.workflow_run.head_sha || inputs.ref || github.sha }}
124124
name: (experimental) Custard CI / ${{ github.job }} (${{ matrix.path }})
125125
job-name: ${{ github.job }} (${{ matrix.path }})
126126
if: ${{ !!github.event.workflow_run }}
127+
- name: Checkout
128+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
129+
- name: Authenticate
130+
uses: google-github-actions/auth@ba79af03959ebeac9769e648f473a284504d9193 # v2.1.10
131+
id: auth
132+
with:
133+
project_id: ${{ env.GOOGLE_SAMPLES_PROJECT }}
134+
workload_identity_provider: projects/1046198160504/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider
135+
service_account: ${{ env.SERVICE_ACCOUNT }}
136+
access_token_lifetime: 600s # 10 minutes
137+
token_format: id_token
138+
id_token_audience: https://action.test/ # service must have this custom audience
139+
id_token_include_email: true
127140
- name: Setup Custard
128-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/setup-custard@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
141+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/setup-custard@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
129142
with:
130143
path: ${{ matrix.path }}
131144
ci-setup: ${{ toJson(fromJson(needs.affected.outputs.ci-setups)[matrix.path]) }}
132-
project-id: ${{ env.GOOGLE_SAMPLES_PROJECT }}
133-
workload-identity-provider: projects/1046198160504/locations/global/workloadIdentityPools/github-actions-pool/providers/github-actions-provider
134-
service-account: ${{ env.GOOGLE_SERVICE_ACCOUNT }}
145+
id-token: ${{ steps.auth.outputs.id_token }}
135146
- name: Check in_progress
136-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
147+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
137148
id: in_progress
138149
with:
139150
check: ${{ steps.queued.outputs.check }}
@@ -142,13 +153,16 @@ jobs:
142153
run: |
143154
timeout ${{ fromJson(needs.affected.outputs.ci-setups)[matrix.path].timeout-minutes }}m \
144155
make test dir=${{ matrix.path }}
156+
env:
157+
# TODO: remove this when the self-contained runner lands.
158+
SERVICE_ACCOUNT: [email protected]
145159
- name: Check success
146-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
160+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
147161
with:
148162
check: ${{ steps.in_progress.outputs.check }}
149163
status: success
150164
- name: Check failure
151-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
165+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
152166
if: failure()
153167
with:
154168
check: ${{ steps.in_progress.outputs.check }}
@@ -162,7 +176,7 @@ jobs:
162176
statuses: write
163177
steps:
164178
- name: Check success
165-
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@34b34881006f34d210c4af9d0f7ba9b2d681621d # v0.2.5
179+
uses: GoogleCloudPlatform/cloud-samples-tools/actions/steps/update-check@9ee708234e240605d96e78f652c333ed6aa95a23 # v0.3.2
166180
with:
167181
check: ${{ needs.affected.outputs.check }}
168182
status: success

0 commit comments

Comments
 (0)