From 4e617e55b46281c5ec22885769757caf825a0df4 Mon Sep 17 00:00:00 2001 From: "Marcelo E. Magallon" Date: Wed, 27 Nov 2024 15:22:03 -0600 Subject: [PATCH] Fix: use no-browser image when triggering Argo workflow Right now we are pointing the argo workflow to the browser image, which doesn't really make sense, as we don't use that browser in public probes. Signed-off-by: Marcelo E. Magallon --- .github/workflows/build_and_publish.yaml | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_and_publish.yaml b/.github/workflows/build_and_publish.yaml index 35f319aa4..74d44e831 100644 --- a/.github/workflows/build_and_publish.yaml +++ b/.github/workflows/build_and_publish.yaml @@ -141,8 +141,8 @@ jobs: if: ${{ always() && needs.validate.result == 'success' && needs.preflight.result == 'success' }} runs-on: github-hosted-ubuntu-x64-small outputs: - image_name: ${{ steps.extract-image-metadata.outputs.image }} - image_version: ${{ steps.extract-image-metadata.outputs.tag }} + image_name: ${{ steps.extract-image-metadata-no-browser.outputs.image }} + image_version: ${{ steps.extract-image-metadata-no-browser.outputs.tag }} steps: - name: Retrieve release app credentials id: get-secrets @@ -217,6 +217,15 @@ jobs: latest file: Dockerfile.no-browser + - name: extract image metadata (no browser) + id: extract-image-metadata-no-browser + run: | + # Note that the variable DOCKER_METADATA_OUTPUT_BAKE_FILE_TAGS + # already contains the name of the variables. It has the form + # key=value\nkey=value\n... + ./scripts/extract-image-info "${DOCKER_METADATA_OUTPUT_BAKE_FILE_TAGS}" + ./scripts/extract-image-info "${DOCKER_METADATA_OUTPUT_BAKE_FILE_TAGS}" >> "$GITHUB_OUTPUT" + - name: push container images to GAR (browser) uses: grafana/shared-workflows/actions/push-to-gar-docker@7d18a46aafb8b875ed76a0bc98852d74b91e7f91 # v1.0.0 with: @@ -230,8 +239,8 @@ jobs: latest-browser file: Dockerfile.browser - - name: extract image metadata - id: extract-image-metadata + - name: extract image metadata (browser) + id: extract-image-metadata-browser run: | # Note that the variable DOCKER_METADATA_OUTPUT_BAKE_FILE_TAGS # already contains the name of the variables. It has the form