From 8e5201785f176622f08ae6f0a943902eb69b00e6 Mon Sep 17 00:00:00 2001 From: Mateusz Hawrus Date: Thu, 15 Feb 2024 16:59:00 +0100 Subject: [PATCH 1/2] fix release workflow --- .github/workflows/release-candidate.yml | 2 ++ .github/workflows/release.yml | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index 6e0986e4..e164307b 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -8,4 +8,6 @@ jobs: uses: ./.github/workflows/acc-tests.yml with: clientId: "${{ vars.TERRAFORM_NOBL9_CLIENT_ID }}" + project: ${{ vars.TERRAFORM_NOBL9_PROJECT }} + secrets: clientSecret: "${{ secrets.TERRAFORM_NOBL9_CLIENT_SECRET }}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 60638897..fac00b09 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,8 +17,16 @@ on: - "v[0-9]+.[0-9]+.[0-9]+-beta" - "v[0-9]+.[0-9]+.[0-9]+-alpha" jobs: + test: + uses: ./.github/workflows/acc-tests.yml + with: + clientId: "${{ vars.TERRAFORM_NOBL9_CLIENT_ID }}" + project: ${{ vars.TERRAFORM_NOBL9_PROJECT }} + secrets: + clientSecret: "${{ secrets.TERRAFORM_NOBL9_CLIENT_SECRET }}" goreleaser: runs-on: ubuntu-latest + needs: test steps: - name: Checkout uses: actions/checkout@v4.1.1 @@ -37,12 +45,6 @@ jobs: passphrase: ${{ secrets.PASSPHRASE }} - name: setup github run: git config --global url."https://n9-machine-user:${{ secrets.GH_TOKEN }}@github.com".insteadOf "https://github.com" - - name: Run acceptance tests - uses: ./.github/workflows/acc-tests.yml - with: - clientId: ${{ vars.TERRAFORM_NOBL9_CLIENT_ID }} - clientSecret: ${{ secrets.TERRAFORM_NOBL9_CLIENT_SECRET }} - project: ${{ vars.TERRAFORM_NOBL9_PROJECT }} - name: Run GoReleaser uses: goreleaser/goreleaser-action@v5.0.0 with: From 52efc5ce513e317d567ef3fe4209c9b000315dd8 Mon Sep 17 00:00:00 2001 From: Mateusz Hawrus Date: Thu, 15 Feb 2024 17:03:22 +0100 Subject: [PATCH 2/2] quite project --- .github/workflows/release-candidate.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml index e164307b..08b11295 100644 --- a/.github/workflows/release-candidate.yml +++ b/.github/workflows/release-candidate.yml @@ -8,6 +8,6 @@ jobs: uses: ./.github/workflows/acc-tests.yml with: clientId: "${{ vars.TERRAFORM_NOBL9_CLIENT_ID }}" - project: ${{ vars.TERRAFORM_NOBL9_PROJECT }} + project: "${{ vars.TERRAFORM_NOBL9_PROJECT }}" secrets: clientSecret: "${{ secrets.TERRAFORM_NOBL9_CLIENT_SECRET }}" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index fac00b09..3dc04688 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: uses: ./.github/workflows/acc-tests.yml with: clientId: "${{ vars.TERRAFORM_NOBL9_CLIENT_ID }}" - project: ${{ vars.TERRAFORM_NOBL9_PROJECT }} + project: "${{ vars.TERRAFORM_NOBL9_PROJECT }}" secrets: clientSecret: "${{ secrets.TERRAFORM_NOBL9_CLIENT_SECRET }}" goreleaser: