From dbe29cd7ced80235d09da2753d13019643eb6711 Mon Sep 17 00:00:00 2001 From: Eoin O'Shaughnessy Date: Wed, 19 Jun 2024 16:33:28 +0100 Subject: [PATCH] fix needs on tag-candidate --- .github/workflows/image-promotion.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/image-promotion.yml b/.github/workflows/image-promotion.yml index 80725d943b..d7e21e5da3 100644 --- a/.github/workflows/image-promotion.yml +++ b/.github/workflows/image-promotion.yml @@ -299,9 +299,17 @@ jobs: dry_run: false secrets: inherit - tag-edge: + tag-candidate: + # pushes edge or release images to gcr/dev + # for main: this keeps a copy of edge in gcr/dev + # for release-*: this stages a release candidate in gcr/dev which can be used for release promotion name: Tag tested image as stable - needs: [checks, build-docker, build-docker-plus, build-docker-nap] + needs: + - checks + - build-docker + - build-docker-plus + - build-docker-nap + - tag-stable permissions: contents: read # To checkout repository id-token: write # To sign into Google Container Registry @@ -313,7 +321,8 @@ jobs: secrets: inherit release-oss: - if: ${{ github.ref_name == github.event.repository.default_branch }} + # pushes edge images to docker hub + if: ${{ !cancelled() && !failure() && github.ref_name == github.event.repository.default_branch }} name: Release Docker OSS needs: [checks, build-docker] uses: ./.github/workflows/oss-release.yml @@ -333,7 +342,8 @@ jobs: secrets: inherit release-plus: - if: ${{ github.ref_name == github.event.repository.default_branch }} + # pushes plus edge images to nginx registry + if: ${{ !cancelled() && !failure() && github.ref_name == github.event.repository.default_branch }} name: Release Docker Plus needs: [checks, build-docker-plus, build-docker-nap] uses: ./.github/workflows/plus-release.yml