From 3757c1246551354084699fdad4f1080685a840cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20L=C3=B3pez=20Ruiz?= Date: Mon, 20 Dec 2021 13:31:10 +0100 Subject: [PATCH] Changes applyed to `2UCGBV3J` --- .github/workflows/main.yml | 7 ++++++- .github/workflows/master.yml | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6b0301e5..284f9eb9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,11 +23,13 @@ jobs: submodules: true token: ${{ secrets.CARTOFANTE_PERSONAL_TOKEN }} + - uses: google-github-actions/auth@v0 + with: + credentials_json: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }} - name: Setup gcloud authentication uses: google-github-actions/setup-gcloud@master with: version: ${{env.GCLOUD_VERSION}} - service_account_key: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }} - name: Configure docker and pull images run: | @@ -93,6 +95,9 @@ jobs: path: 'docker-dev-env' token: ${{ secrets.CARTOFANTE_PERSONAL_TOKEN }} + - uses: google-github-actions/auth@v0 + with: + credentials_json: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }} - name: Set up gcloud I uses: google-github-actions/setup-gcloud@master with: diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 7fc3c3f9..3a599cf0 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -30,11 +30,13 @@ jobs: docker build -f private/Dockerfile --label="org.opencontainers.image.created=$(date --rfc-3339=seconds)" --label=org.opencontainers.image.revision=${GITHUB_SHA} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:latest -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_REF##*/} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_SHA::7} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api:${GITHUB_REF##*/}--${GITHUB_SHA::7} . docker build -f private/Dockerfile.onprem --label="org.opencontainers.image.created=$(date --rfc-3339=seconds)" --label=org.opencontainers.image.revision=${GITHUB_SHA} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:latest -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:${GITHUB_REF##*/} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:${GITHUB_SHA::7} -t gcr.io/$ARTIFACTS_PROJECT_ID/sql-api-onprem:${GITHUB_REF##*/}--${GITHUB_SHA::7} . + - uses: google-github-actions/auth@v0 + with: + credentials_json: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }} - name: Setup gcloud authentication uses: google-github-actions/setup-gcloud@master with: version: ${{env.GCLOUD_VERSION}} - service_account_key: ${{ secrets.ARTIFACTS_GCLOUD_ACCOUNT_BASE64 }} - name: Configure docker run: gcloud auth configure-docker