From 17c82caac47a3e7f4b3dd22997bb6fb4cd6ffdb3 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Mon, 26 Apr 2021 12:54:30 -0400 Subject: Fix logic for pushing stable multi-arch images The intention is to only push an image if there is ***NOT*** an existing tag. The original logic for this condition was inverted. Also, improve radability of the `{container,podman}_push=true` statements. Signed-off-by: Chris Evich --- .github/workflows/multi-arch-build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/multi-arch-build.yaml b/.github/workflows/multi-arch-build.yaml index 41ef3f3a6..e4ab88544 100644 --- a/.github/workflows/multi-arch-build.yaml +++ b/.github/workflows/multi-arch-build.yaml @@ -77,7 +77,7 @@ jobs: docker://$PODMAN_QUAY_REGISTRY/stable | \ jq -r '.Tags[]') PUSH="false" - if fgrep -qx "$VERSION" <<<"$ALLTAGS"; then + if ! fgrep -qx "$VERSION" <<<"$ALLTAGS"; then PUSH="true" fi @@ -85,7 +85,7 @@ jobs: # Only push if version tag does not exist if [[ "$PUSH" == "true" ]]; then echo "Will push $FQIN" - echo "::set-output name=podman_push::${PUSH}" + echo "::set-output name=podman_push::true" echo "::set-output name=podman_fqin::${FQIN}" else echo "Not pushing, $FQIN already exists." @@ -97,7 +97,7 @@ jobs: docker://$CONTAINERS_QUAY_REGISTRY/podman | \ jq -r '.Tags[]') PUSH="false" - if fgrep -qx "$VERSION" <<<"$ALLTAGS"; then + if ! fgrep -qx "$VERSION" <<<"$ALLTAGS"; then PUSH="true" fi @@ -105,7 +105,7 @@ jobs: # Only push if version tag does not exist if [[ "$PUSH" == "true" ]]; then echo "Will push $FQIN" - echo "::set-output name=containers_push::${PUSH}" + echo "::set-output name=containers_push::true" echo "::set-output name=containers_fqin::$FQIN" else echo "Not pushing, $FQIN already exists." -- cgit v1.2.3-54-g00ecf