From 6e9ff446c84863418eb96f904b8b893699912bd6 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 5 Feb 2025 16:10:00 +0100 Subject: [PATCH 1/2] [no-relnote] Use github.ref_name to detect PRs Signed-off-by: Evan Lezar --- .github/workflows/image.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index e63ea840..f548769d 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -41,7 +41,7 @@ jobs: - centos7-x86_64 - centos8-ppc64le ispr: - - ${{github.event_name == 'pull_request'}} + - ${{ github.ref_name != 'main' && !startsWith( github.ref_name, 'release-' ) }} exclude: - ispr: true target: ubuntu18.04-arm64 @@ -82,7 +82,7 @@ jobs: - ubi8 - packaging ispr: - - ${{github.event_name == 'pull_request'}} + - ${{ github.ref_name != 'main' && !startsWith( github.ref_name, 'release-' ) }} exclude: - ispr: true dist: ubi8 From f830653738a2a3a180b27e94341c4be71fa061e2 Mon Sep 17 00:00:00 2001 From: Evan Lezar Date: Wed, 5 Feb 2025 16:11:25 +0100 Subject: [PATCH 2/2] [no-relnote] Remove unused LABEL_IMAGE_SOURCE Signed-off-by: Evan Lezar --- .github/workflows/image.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index f548769d..693239f6 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -95,9 +95,6 @@ jobs: run: | echo "COMMIT_SHORT_SHA=${GITHUB_SHA:0:8}" >> $GITHUB_ENV echo "LOWERCASE_REPO_OWNER=$(echo "${GITHUB_REPOSITORY_OWNER}" | awk '{print tolower($0)}')" >> $GITHUB_ENV - REPO_FULL_NAME="${{ github.event.pull_request.head.repo.full_name }}" - echo "${REPO_FULL_NAME}" - echo "LABEL_IMAGE_SOURCE=https://github.com/${REPO_FULL_NAME}" >> $GITHUB_ENV PUSH_ON_BUILD="false" BUILD_MULTI_ARCH_IMAGES="false"