From d95672ccf310657fe62be5a636bbb209d52268f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Pr=C3=BCssing?= Date: Sat, 19 Sep 2026 16:03:31 +0200 Subject: [PATCH 1/3] ci: add rollup checks for matrix jobs --- .github/workflows/buildx.yml | 20 ++++++++++++++++---- .github/workflows/dockerimage.yml | 12 ++++++++++++ .github/workflows/hadolint.yml | 2 +- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index b859b77..21c45b2 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -94,7 +94,7 @@ jobs: - name: Docker Buildx (build) uses: docker/build-push-action@v7.4.0 - if: success() && !contains(github.ref, 'master') + if: success() && github.ref != format('refs/heads/{0}', github.event.repository.default_branch) with: push: false context: ./${{ matrix.docker-file.path }} @@ -104,7 +104,7 @@ jobs: tags: ${{ steps.prepare.outputs.tags }} - name: Docker Login - if: success() && contains(github.ref, 'master') + if: success() && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) uses: docker/login-action@v4.6.0 with: username: ${{ secrets.DOCKER_USERNAME }} @@ -112,7 +112,7 @@ jobs: - name: Docker Buildx (push) uses: docker/build-push-action@v7.4.0 - if: success() && contains(github.ref, 'master') + if: success() && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) with: push: true context: ./${{ matrix.docker-file.path }} @@ -122,7 +122,7 @@ jobs: tags: ${{ steps.prepare.outputs.tags }} - name: Inspect Image - if: always() && github.event_name != 'pull_request' && contains(github.ref, 'master') + if: always() && github.event_name != 'pull_request' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) run: | docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }} @@ -130,3 +130,15 @@ jobs: if: always() && github.event_name != 'pull_request' run: | rm -f ${HOME}/.docker/config.json + + buildx-summary: + runs-on: ubuntu-latest + needs: buildx + if: always() + + steps: + - name: Verify all matrix jobs passed + run: | + if [[ "${{ needs.buildx.result }}" != "success" ]]; then + exit 1 + fi diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 0d80792..d01cba6 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -71,6 +71,18 @@ jobs: path: screenshots/ if-no-files-found: ignore + build-summary: + runs-on: ubuntu-latest + needs: build + if: always() + + steps: + - name: Verify all matrix jobs passed + run: | + if [[ "${{ needs.build.result }}" != "success" ]]; then + exit 1 + fi + auto-merge: runs-on: ubuntu-latest needs: build diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml index ed3e4cf..48e4e1e 100644 --- a/.github/workflows/hadolint.yml +++ b/.github/workflows/hadolint.yml @@ -10,7 +10,7 @@ permissions: contents: read jobs: - build: + hadolint: runs-on: macos-latest steps: - uses: actions/checkout@v7.0.1 From 81ec84d882bbafa7b9dfa4a56757d17487139afc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Pr=C3=BCssing?= Date: Sat, 19 Sep 2026 16:04:26 +0200 Subject: [PATCH 2/3] ci: use explicit main branch in buildx conditions --- .github/workflows/buildx.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index 21c45b2..6ee087a 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -94,7 +94,7 @@ jobs: - name: Docker Buildx (build) uses: docker/build-push-action@v7.4.0 - if: success() && github.ref != format('refs/heads/{0}', github.event.repository.default_branch) + if: success() && github.ref_name != 'main' with: push: false context: ./${{ matrix.docker-file.path }} @@ -104,7 +104,7 @@ jobs: tags: ${{ steps.prepare.outputs.tags }} - name: Docker Login - if: success() && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) + if: success() && github.ref_name == 'main' uses: docker/login-action@v4.6.0 with: username: ${{ secrets.DOCKER_USERNAME }} @@ -112,7 +112,7 @@ jobs: - name: Docker Buildx (push) uses: docker/build-push-action@v7.4.0 - if: success() && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) + if: success() && github.ref_name == 'main' with: push: true context: ./${{ matrix.docker-file.path }} @@ -122,7 +122,7 @@ jobs: tags: ${{ steps.prepare.outputs.tags }} - name: Inspect Image - if: always() && github.event_name != 'pull_request' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) + if: always() && github.event_name != 'pull_request' && github.ref_name == 'main' run: | docker buildx imagetools inspect ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }} From ab2876fbaa3dd0728898c94e28e7f5164f710d2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Pr=C3=BCssing?= Date: Sat, 19 Sep 2026 16:05:11 +0200 Subject: [PATCH 3/3] ci: trigger on main --- .github/workflows/buildx.yml | 2 +- .github/workflows/dockerimage.yml | 2 +- .github/workflows/hadolint.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildx.yml b/.github/workflows/buildx.yml index 6ee087a..876b345 100644 --- a/.github/workflows/buildx.yml +++ b/.github/workflows/buildx.yml @@ -6,7 +6,7 @@ on: pull_request: push: branches: - - master + - main permissions: contents: read diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index d01cba6..82f7179 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -3,7 +3,7 @@ name: Test Docker image on: push: branches: - - master + - main pull_request: workflow_dispatch: diff --git a/.github/workflows/hadolint.yml b/.github/workflows/hadolint.yml index 48e4e1e..93d2a2c 100644 --- a/.github/workflows/hadolint.yml +++ b/.github/workflows/hadolint.yml @@ -3,7 +3,7 @@ name: Lint Dockerfiles on: push: branches: - - master + - main pull_request: permissions: