From 080d112f3e5da540684a0c5102d47f9e899a7d11 Mon Sep 17 00:00:00 2001 From: Pagan Gazzard Date: Tue, 27 Sep 2022 11:57:52 +0000 Subject: [PATCH] Use inherited secrets for flowzone Change-type: patch --- .github/actions/finalize/action.yml | 2 +- .github/actions/publish/action.yml | 2 +- .github/workflows/flowzone.yml | 7 +------ 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/actions/finalize/action.yml b/.github/actions/finalize/action.yml index 8e103b97..b42dcc10 100644 --- a/.github/actions/finalize/action.yml +++ b/.github/actions/finalize/action.yml @@ -15,7 +15,7 @@ runs: steps: - uses: balena-io/deploy-to-balena-action@v0.13.0 with: - balena_token: ${{ fromJSON(inputs.secrets).CUSTOM_JOB_SECRET_1 }} + balena_token: ${{ fromJSON(inputs.secrets).BALENA_STAGING_TOKEN }} fleet: ${{ env.matrix_value }} environment: balena-staging.com versionbot: false # ignore versionbot branch since the flowzone source is already versioned diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index 039e249e..e470ce99 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -15,7 +15,7 @@ runs: steps: - uses: balena-io/deploy-to-balena-action@v0.13.0 with: - balena_token: ${{ fromJSON(inputs.secrets).CUSTOM_JOB_SECRET_1 }} + balena_token: ${{ fromJSON(inputs.secrets).BALENA_STAGING_TOKEN }} fleet: ${{ env.matrix_value }} environment: balena-staging.com versionbot: false # ignore versionbot branch since the flowzone source is already versioned diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml index b5c13182..69faa5e9 100644 --- a/.github/workflows/flowzone.yml +++ b/.github/workflows/flowzone.yml @@ -11,12 +11,7 @@ jobs: flowzone: name: Flowzone uses: product-os/flowzone/.github/workflows/flowzone.yml@master - secrets: - FLOWZONE_TOKEN: ${{ secrets.FLOWZONE_TOKEN }} - GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY }} - GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - BALENA_API_KEY: ${{ secrets.BALENA_TOKEN }} - CUSTOM_JOB_SECRET_1: ${{ secrets.BALENA_STAGING_TOKEN }} + secrets: inherit with: balena_slugs: | balena_os/aarch64-supervisor,