Skip to content

Commit 3a06066

Browse files
committed
[no-relnote] Simplify multi-arch checks
Signed-off-by: Evan Lezar <[email protected]>
1 parent c0292f5 commit 3a06066

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

.github/workflows/image.yaml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,21 +90,12 @@ jobs:
9090
echo "COMMIT_SHORT_SHA=${GITHUB_SHA:0:8}" >> $GITHUB_ENV
9191
echo "LOWERCASE_REPO_OWNER=$(echo "${GITHUB_REPOSITORY_OWNER}" | awk '{print tolower($0)}')" >> $GITHUB_ENV
9292
93-
PUSH_ON_BUILD="false"
94-
BUILD_MULTI_ARCH_IMAGES="false"
95-
if [[ "${{ github.event_name }}" == "pull_request" ]]; then
96-
if [[ "${{ github.actor }}" != "dependabot[bot]" && "${{ github.event.pull_request.head.repo.full_name }}" == "${{ github.repository }}" ]]; then
97-
# For non-fork PRs that are not created by dependabot we do push images
98-
PUSH_ON_BUILD="true"
99-
fi
100-
elif [[ "${{ github.event_name }}" == "push" ]]; then
101-
# On push events we do generate images and enable muilti-arch builds
102-
PUSH_ON_BUILD="true"
103-
BUILD_MULTI_ARCH_IMAGES="true"
93+
BUILD_MULTI_ARCH_IMAGES="true"
94+
if [[ "${{ matrix.ispr }}" == "true" ]]; then
95+
BUILD_MULTI_ARCH_IMAGES="false"
10496
fi
105-
echo "PUSH_ON_BUILD=${PUSH_ON_BUILD}" >> $GITHUB_ENV
97+
echo "PUSH_ON_BUILD=\"true\"" >> $GITHUB_ENV
10698
echo "BUILD_MULTI_ARCH_IMAGES=${BUILD_MULTI_ARCH_IMAGES}" >> $GITHUB_ENV
107-
10899
- name: Set up QEMU
109100
uses: docker/setup-qemu-action@v3
110101
with:

0 commit comments

Comments
 (0)