From 56efabf7579e27871619faf9927d2242a6d1e0cd Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 16 Mar 2026 15:10:35 -0400 Subject: [PATCH 1/2] Trigger Quay push on oadp-* branch pushes instead of tag pushes Changes the workflow trigger from version tags (v*) to oadp-* branches so that images are pushed when PRs merge into oadp-dev or release branches like oadp-1.6. Uses the branch name as the image version tag. Co-Authored-By: Claude Opus 4.6 (1M context) Signed-off-by: Joseph --- .github/workflows/quay_binaries_push.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/quay_binaries_push.yml b/.github/workflows/quay_binaries_push.yml index 14391d0..2969531 100644 --- a/.github/workflows/quay_binaries_push.yml +++ b/.github/workflows/quay_binaries_push.yml @@ -1,10 +1,10 @@ -# Push binaries to Quay.io, when a new release is created +# Push binaries to Quay.io on pushes to oadp-* branches name: Multi-Arch Binary Push to Quay.io on: push: - tags: - - 'v*' + branches: + - 'oadp-*' pull_request: @@ -58,7 +58,7 @@ jobs: name: Create and Push Multi-Arch Manifest runs-on: ubuntu-latest needs: multi-arch-build - if: startsWith(github.ref_name, 'v') + if: startsWith(github.ref_name, 'oadp-') steps: - name: Download all artifacts uses: actions/download-artifact@v4 From 26a44f7452890222f9ae3a49ccf4cf7a6ce0908c Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 16 Mar 2026 15:28:56 -0400 Subject: [PATCH 2/2] Scope PR trigger and refine manifest push conditions Restricts pull_request trigger to oadp-* branches to avoid unnecessary CI runs. Gates push-manifest on event_name == 'push' for clarity. Pushes 'latest' tag only for oadp-dev; other branches get their branch name as the image tag. Co-Authored-By: Claude Opus 4.6 (1M context) Signed-off-by: Joseph --- .github/workflows/quay_binaries_push.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/quay_binaries_push.yml b/.github/workflows/quay_binaries_push.yml index 2969531..d1fe756 100644 --- a/.github/workflows/quay_binaries_push.yml +++ b/.github/workflows/quay_binaries_push.yml @@ -6,6 +6,8 @@ on: branches: - 'oadp-*' pull_request: + branches: + - 'oadp-*' env: @@ -58,7 +60,7 @@ jobs: name: Create and Push Multi-Arch Manifest runs-on: ubuntu-latest needs: multi-arch-build - if: startsWith(github.ref_name, 'oadp-') + if: github.event_name == 'push' steps: - name: Download all artifacts uses: actions/download-artifact@v4 @@ -83,6 +85,7 @@ jobs: buildah tag $S390X_ID ${{ env.IMAGE_REPO }}:${{ github.ref_name }}-s390x - name: Create and push multi-arch manifest (version tag) + if: github.ref_name != 'oadp-dev' run: | buildah manifest create ${{ env.IMAGE_REPO }}:${{ github.ref_name }} buildah manifest add ${{ env.IMAGE_REPO }}:${{ github.ref_name }} ${{ env.IMAGE_REPO }}:${{ github.ref_name }}-amd64 @@ -92,6 +95,7 @@ jobs: buildah manifest push --all ${{ env.IMAGE_REPO }}:${{ github.ref_name }} - name: Create and push multi-arch manifest (latest tag) + if: github.ref_name == 'oadp-dev' run: | buildah manifest create ${{ env.IMAGE_REPO }}:latest buildah manifest add ${{ env.IMAGE_REPO }}:latest ${{ env.IMAGE_REPO }}:${{ github.ref_name }}-amd64