From 932982305f84abfda4d1b2105e1dabbc003b9114 Mon Sep 17 00:00:00 2001 From: Michael Goldsmith Date: Fri, 27 May 2022 05:42:09 +0100 Subject: [PATCH] Fixed master workflow issues --- .github/workflows/master-build-and-test.yml | 18 +++++++++++------- .github/workflows/master-trigger-release.yml | 3 ++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/master-build-and-test.yml b/.github/workflows/master-build-and-test.yml index 055c5a534..b02359345 100644 --- a/.github/workflows/master-build-and-test.yml +++ b/.github/workflows/master-build-and-test.yml @@ -2,9 +2,12 @@ name: Master Build and Test Workflow on: push: branches: - - master + - master-release-hotfix jobs: master-build-and-test: + permissions: + contents: 'read' + id-token: 'write' environment: release_env runs-on: ubuntu-latest steps: @@ -45,13 +48,14 @@ jobs: - name: Assemble debug and androidTest APKs run: ./gradlew assembleDebug assembleAndroidTest - - name: Setup gcloud - uses: google-github-actions/setup-gcloud@master + - id: 'auth' + uses: 'google-github-actions/auth@v0.8.0' with: - project_id: ${{ secrets.GCP_PROJECT_ID }} - service_account_email: ${{ secrets.GCP_SERVICE_ACCOUNT_EMAIL }} - service_account_key: ${{ secrets.GCP_SA_KEY }} - export_default_credentials: true + credentials_json: ${{ secrets.RELEASE_SERVICE_ACCOUNT_JSON }} + + + - name: Setup gcloud + uses: google-github-actions/setup-gcloud@v0.6.0 - name: Run firebase tests on gcloud and pull coverage data run: | diff --git a/.github/workflows/master-trigger-release.yml b/.github/workflows/master-trigger-release.yml index dd8c8b038..1cebdd2bd 100644 --- a/.github/workflows/master-trigger-release.yml +++ b/.github/workflows/master-trigger-release.yml @@ -1,5 +1,6 @@ name: Master Check Run Completed Workflow on: + workflow_dispatch: check_run: types: [completed] branches: @@ -55,7 +56,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 12 + node-version: 16 - name: Set up Python 3.9 uses: actions/setup-python@v3.1.2