From 7891f1763c9dccbc2df619be551c6f10c9630bc3 Mon Sep 17 00:00:00 2001 From: pimlie Date: Thu, 19 Sep 2024 14:05:11 +0200 Subject: [PATCH] chore: uncomment docker builds --- .github/workflows/cron.yml | 49 +++++++++++++++++------------------ .github/workflows/release.yml | 4 +++ 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml index 59d8b50..55d7040 100644 --- a/.github/workflows/cron.yml +++ b/.github/workflows/cron.yml @@ -55,28 +55,27 @@ jobs: type=semver,pattern={{version}}-${{matrix.flavor}},value=${{ steps.checkout.outputs.tag }} type=semver,pattern={{major}}.{{minor}}-${{matrix.flavor}},value=${{ steps.checkout.outputs.tag }} type=semver,pattern={{major}}-${{matrix.flavor}},value=${{ steps.checkout.outputs.tag }} -# -# - name: Set up QEMU -# uses: docker/setup-qemu-action@v3 -# -# - name: Set up Docker Buildx -# uses: docker/setup-buildx-action@v3 -# -# - name: Login to GitHub Container Registry -# if: github.event_name != 'pull_request' -# uses: docker/login-action@v3 -# with: -# registry: ghcr.io -# username: ${{ github.actor }} -# password: ${{ secrets.GITHUB_TOKEN }} -# -# - name: Build and push -# uses: docker/build-push-action@v5 -# with: -# context: . -# push: ${{ github.event_name != 'pull_request' }} -# file: Containerfile.${{ matrix.flavor }} -# platforms: linux/amd64,linux/arm64/v8${{ matrix.platform == 'debian' && ',linux/arm/v7' || '' }} -# tags: ${{ steps.meta.outputs.tags }} -# labels: ${{ steps.meta.outputs.labels }} -# \ No newline at end of file + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to GitHub Container Registry + if: github.event_name != 'pull_request' + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build and push + uses: docker/build-push-action@v5 + with: + context: . + push: ${{ github.event_name != 'pull_request' }} + file: Containerfile.${{ matrix.flavor }} + platforms: linux/amd64,linux/arm64/v8${{ matrix.platform == 'debian' && ',linux/arm/v7' || '' }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 056337c..eebb876 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,6 +6,10 @@ on: tags: - "[0-9]+.[0-9]+.[0-9]+" +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: build: runs-on: ubuntu-latest