Skip to content

Commit fb8036a

Browse files
ci: fix gcp service accounts (#19312)
Service accounts got deleted, oops
1 parent 64f0aaa commit fb8036a

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

.github/workflows/ci.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,8 @@ jobs:
256256
pushd /tmp/proto
257257
curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-linux-x86_64.zip
258258
unzip protoc.zip
259-
cp -r ./bin/* /usr/local/bin
260-
cp -r ./include /usr/local/bin/include
259+
sudo cp -r ./bin/* /usr/local/bin
260+
sudo cp -r ./include /usr/local/bin/include
261261
popd
262262
263263
- name: make gen
@@ -875,8 +875,8 @@ jobs:
875875
pushd /tmp/proto
876876
curl -L -o protoc.zip https://github.com/protocolbuffers/protobuf/releases/download/v23.4/protoc-23.4-linux-x86_64.zip
877877
unzip protoc.zip
878-
cp -r ./bin/* /usr/local/bin
879-
cp -r ./include /usr/local/bin/include
878+
sudo cp -r ./bin/* /usr/local/bin
879+
sudo cp -r ./include /usr/local/bin/include
880880
popd
881881
882882
- name: Setup Go
@@ -1129,8 +1129,8 @@ jobs:
11291129
id: gcloud_auth
11301130
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
11311131
with:
1132-
workload_identity_provider: ${{ secrets.GCP_CODE_SIGNING_WORKLOAD_ID_PROVIDER }}
1133-
service_account: ${{ secrets.GCP_CODE_SIGNING_SERVICE_ACCOUNT }}
1132+
workload_identity_provider: ${{ vars.GCP_CODE_SIGNING_WORKLOAD_ID_PROVIDER }}
1133+
service_account: ${{ vars.GCP_CODE_SIGNING_SERVICE_ACCOUNT }}
11341134
token_format: "access_token"
11351135

11361136
- name: Setup GCloud SDK
@@ -1433,8 +1433,8 @@ jobs:
14331433
- name: Authenticate to Google Cloud
14341434
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
14351435
with:
1436-
workload_identity_provider: projects/573722524737/locations/global/workloadIdentityPools/github/providers/github
1437-
service_account: coder-ci@coder-dogfood.iam.gserviceaccount.com
1436+
workload_identity_provider: ${{ vars.GCP_WORKLOAD_ID_PROVIDER }}
1437+
service_account: ${{ vars.GCP_SERVICE_ACCOUNT }}
14381438

14391439
- name: Set up Google Cloud SDK
14401440
uses: google-github-actions/setup-gcloud@cb1e50a9932213ecece00a606661ae9ca44f3397 # v2.2.0

.github/workflows/dogfood.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@ jobs:
131131
- name: Authenticate to Google Cloud
132132
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
133133
with:
134-
workload_identity_provider: projects/573722524737/locations/global/workloadIdentityPools/github/providers/github
135-
service_account: coder-ci@coder-dogfood.iam.gserviceaccount.com
134+
workload_identity_provider: ${{ vars.GCP_WORKLOAD_ID_PROVIDER }}
135+
service_account: ${{ vars.GCP_SERVICE_ACCOUNT }}
136136

137137
- name: Terraform init and validate
138138
run: |

.github/workflows/pr-deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ jobs:
420420
curl -fsSL "$URL" -o "${DEST}"
421421
chmod +x "${DEST}"
422422
"${DEST}" version
423-
mv "${DEST}" /usr/local/bin/coder
423+
sudo mv "${DEST}" /usr/local/bin/coder
424424
425425
- name: Create first user
426426
if: needs.get_info.outputs.NEW == 'true' || github.event.inputs.deploy == 'true'

.github/workflows/release.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,8 @@ jobs:
288288
id: gcloud_auth
289289
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
290290
with:
291-
workload_identity_provider: ${{ secrets.GCP_CODE_SIGNING_WORKLOAD_ID_PROVIDER }}
292-
service_account: ${{ secrets.GCP_CODE_SIGNING_SERVICE_ACCOUNT }}
291+
workload_identity_provider: ${{ vars.GCP_CODE_SIGNING_WORKLOAD_ID_PROVIDER }}
292+
service_account: ${{ vars.GCP_CODE_SIGNING_SERVICE_ACCOUNT }}
293293
token_format: "access_token"
294294

295295
- name: Setup GCloud SDK
@@ -699,8 +699,8 @@ jobs:
699699
- name: Authenticate to Google Cloud
700700
uses: google-github-actions/auth@b7593ed2efd1c1617e1b0254da33b86225adb2a5 # v2.1.12
701701
with:
702-
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_ID_PROVIDER }}
703-
service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
702+
workload_identity_provider: ${{ vars.GCP_WORKLOAD_ID_PROVIDER }}
703+
service_account: ${{ vars.GCP_SERVICE_ACCOUNT }}
704704

705705
- name: Setup GCloud SDK
706706
uses: google-github-actions/setup-gcloud@cb1e50a9932213ecece00a606661ae9ca44f3397 # 2.2.0

0 commit comments

Comments
 (0)