Unverified Commit 89c116fa authored by David vonThenen's avatar David vonThenen Committed by GitHub
Browse files

Fix GCP upload to use the latest upload provider (auth change) (#4024)

parent d0462739
Showing with 8 additions and 8 deletions
+8 -8
...@@ -65,13 +65,16 @@ jobs: ...@@ -65,13 +65,16 @@ jobs:
run: | run: |
make prep-gcp-tce-bucket make prep-gcp-tce-bucket
make build-cli-plugins-nopublish make build-cli-plugins-nopublish
- id: auth-to-gcp-buckets
uses: google-github-actions/auth@v0
with:
credentials_json: ${{ secrets.GCP_BUCKET_SA }}
- name: Upload Artifacts to Staging Bucket - name: Upload Artifacts to Staging Bucket
id: upload-artifacts-staging id: upload-artifacts-staging
uses: google-github-actions/upload-cloud-storage@v0.9.0 uses: google-github-actions/upload-cloud-storage@v0.9.0
with: with:
path: ./artifacts path: ./artifacts
destination: tce-cli-plugins-staging destination: tce-cli-plugins-staging
credentials: ${{ secrets.GCP_BUCKET_SA }}
teardown-runner: teardown-runner:
name: Stop self-hosted EC2 runner name: Stop self-hosted EC2 runner
# Only run this job if we're in the main repo, not a fork. # Only run this job if we're in the main repo, not a fork.
......
...@@ -77,27 +77,28 @@ jobs: ...@@ -77,27 +77,28 @@ jobs:
run: | run: |
make ensure-deps make ensure-deps
make release-buckets make release-buckets
- id: auth-to-gcp-buckets
uses: google-github-actions/auth@v0
with:
credentials_json: ${{ secrets.GCP_BUCKET_SA }}
- name: Upload TCE Artifacts to Staging Bucket - name: Upload TCE Artifacts to Staging Bucket
id: upload-artifacts-staging id: upload-artifacts-staging
uses: google-github-actions/upload-cloud-storage@v0.9.0 uses: google-github-actions/upload-cloud-storage@v0.9.0
with: with:
path: ./artifacts path: ./artifacts
destination: tce-cli-plugins-staging destination: tce-cli-plugins-staging
credentials: ${{ secrets.GCP_BUCKET_SA }}
- name: Upload TCE Artifacts to Update Bucket - name: Upload TCE Artifacts to Update Bucket
id: upload-tce-artifacts-update id: upload-tce-artifacts-update
uses: google-github-actions/upload-cloud-storage@v0.9.0 uses: google-github-actions/upload-cloud-storage@v0.9.0
with: with:
path: ./artifacts path: ./artifacts
destination: tce-cli-plugins destination: tce-cli-plugins
credentials: ${{ secrets.GCP_BUCKET_SA }}
- name: Upload TF Artifacts to Update Bucket - name: Upload TF Artifacts to Update Bucket
id: upload-tf-artifacts-update id: upload-tf-artifacts-update
uses: google-github-actions/upload-cloud-storage@v0.9.0 uses: google-github-actions/upload-cloud-storage@v0.9.0
with: with:
path: /tmp/tce-scratch-space/tanzu-framework/artifacts path: /tmp/tce-scratch-space/tanzu-framework/artifacts
destination: tce-framework-cli-plugins/artifacts destination: tce-framework-cli-plugins/artifacts
credentials: ${{ secrets.GCP_BUCKET_SA }}
parent: false parent: false
- name: Upload TF Admin Artifacts to Update Bucket - name: Upload TF Admin Artifacts to Update Bucket
id: upload-tf-artifacts-admin-update id: upload-tf-artifacts-admin-update
...@@ -105,7 +106,6 @@ jobs: ...@@ -105,7 +106,6 @@ jobs:
with: with:
path: /tmp/tce-scratch-space/tanzu-framework/artifacts-admin path: /tmp/tce-scratch-space/tanzu-framework/artifacts-admin
destination: tce-framework-cli-plugins-admin/artifacts-admin destination: tce-framework-cli-plugins-admin/artifacts-admin
credentials: ${{ secrets.GCP_BUCKET_SA }}
parent: false parent: false
- name: Prune Buckets - name: Prune Buckets
env: env:
...@@ -118,14 +118,12 @@ jobs: ...@@ -118,14 +118,12 @@ jobs:
with: with:
path: ./artifacts path: ./artifacts
destination: tce-tanzu-cli-plugins destination: tce-tanzu-cli-plugins
credentials: ${{ secrets.GCP_BUCKET_SA }}
- name: Upload TF Artifacts to Release Bucket - name: Upload TF Artifacts to Release Bucket
id: upload-tf-artifacts-release id: upload-tf-artifacts-release
uses: google-github-actions/upload-cloud-storage@v0.9.0 uses: google-github-actions/upload-cloud-storage@v0.9.0
with: with:
path: /tmp/tce-scratch-space/tanzu-framework/artifacts path: /tmp/tce-scratch-space/tanzu-framework/artifacts
destination: tce-tanzu-cli-framework/artifacts destination: tce-tanzu-cli-framework/artifacts
credentials: ${{ secrets.GCP_BUCKET_SA }}
parent: false parent: false
- name: Upload TF Artifacts-Admin to Release Bucket - name: Upload TF Artifacts-Admin to Release Bucket
id: upload-tf-artifacts-admin-release id: upload-tf-artifacts-admin-release
...@@ -133,7 +131,6 @@ jobs: ...@@ -133,7 +131,6 @@ jobs:
with: with:
path: /tmp/tce-scratch-space/tanzu-framework/artifacts-admin path: /tmp/tce-scratch-space/tanzu-framework/artifacts-admin
destination: tce-tanzu-cli-framework-admin/artifacts-admin destination: tce-tanzu-cli-framework-admin/artifacts-admin
credentials: ${{ secrets.GCP_BUCKET_SA }}
parent: false parent: false
teardown-runner: teardown-runner:
name: Stop self-hosted EC2 runner name: Stop self-hosted EC2 runner
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment