From 9b51c20497660e8e29484d3c24dfecf4c4db39e4 Mon Sep 17 00:00:00 2001 From: Andrew Azores Date: Wed, 5 Jun 2024 16:49:28 -0400 Subject: [PATCH] fixup! resolve conflicts --- .github/workflows/push-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/push-ci.yml b/.github/workflows/push-ci.yml index 694a502ec1..3023981234 100644 --- a/.github/workflows/push-ci.yml +++ b/.github/workflows/push-ci.yml @@ -50,8 +50,8 @@ jobs: IMAGE_VERSION: ${{ needs.build-and-test-amd64.outputs.image-version }} run: | podman load -i cryostat-amd64.tar - if: github.repository_owner == 'cryostatio' podman tag $CRYOSTAT_IMG:$IMAGE_VERSION-linux-amd64 + if: github.repository_owner == 'cryostatio' - uses: actions/download-artifact@v3 with: name: cryostat-arm64 @@ -61,16 +61,16 @@ jobs: IMAGE_VERSION: ${{ needs.build-and-test-arm64.outputs.image-version }} run: | podman load -i cryostat-arm64.tar - if: github.repository_owner == 'cryostatio' podman tag $CRYOSTAT_IMG:$IMAGE_VERSION-linux-arm64 + if: github.repository_owner == 'cryostatio' - name: Create OCI Manifest id: create-manifest env: IMAGE_VERSION: ${{ needs.build-and-test-amd64.outputs.image-version }} run: | podman manifest create $CRYOSTAT_IMG:$IMAGE_VERSION containers-storage:$CRYOSTAT_IMG:$IMAGE_VERSION-linux-amd64 containers-storage:$CRYOSTAT_IMG:$IMAGE_VERSION-linux-arm64 - if: github.repository_owner == 'cryostatio' echo "tags=$IMAGE_VERSION" >> "$GITHUB_OUTPUT" + if: github.repository_owner == 'cryostatio' - name: Push to quay.io uses: redhat-actions/push-to-registry@v2 with: