From 0e2355e17bd9eb7c9859c39bd1456e51f20da993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=96hrstr=C3=B6m?= Date: Thu, 29 Dec 2022 17:04:34 +0100 Subject: [PATCH] Work on release process. --- .github/workflows/build_docker.yml | 15 ++++++++++++--- .github/workflows/build_snap.yml | 30 ++++++++++++++++++++++-------- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build_docker.yml b/.github/workflows/build_docker.yml index 90dcd98..535c7af 100644 --- a/.github/workflows/build_docker.yml +++ b/.github/workflows/build_docker.yml @@ -5,8 +5,8 @@ on: branches: - 'master' tags: - - '[0-9]+.[0-9]+.[0-9]+' - - '[0-9]+.[0-9]+.[0-9]+RC[0-9]+' + - '[0-9]+\.[0-9]+\.[0-9]+' + - '[0-9]+\.[0-9]+\.[0-9]+-RC[0-9]+' jobs: docker: @@ -43,9 +43,18 @@ jobs: platforms: linux/amd64,linux/arm64,linux/armv7 push: true tags: weetmuts/wmbusmeters:latest + - + name: Build and push candidate + if: ${{ steps.meta.outputs.tags && contains(steps.meta.outputs.tags, '-RC') }} + uses: docker/build-push-action@v3 + with: + context: docker/ + platforms: linux/amd64,linux/arm64,linux/armv7 + push: true + tags: weetmuts/wmbusmeters:candidate-${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.version'] }} - name: Build and push tagged release - if: ${{ steps.meta.outputs.tags }} + if: ${{ steps.meta.outputs.tags && !contains(steps.meta.outputs.tags, '-RC') }} uses: docker/build-push-action@v3 with: context: docker/ diff --git a/.github/workflows/build_snap.yml b/.github/workflows/build_snap.yml index 525ef27..22f68e8 100644 --- a/.github/workflows/build_snap.yml +++ b/.github/workflows/build_snap.yml @@ -5,8 +5,8 @@ on: branches: - 'master' tags: - - '[0-9]+.[0-9]+.[0-9]+' - - '[0-9]+.[0-9]+.[0-9]+RC[0-9]+' + - '[0-9]+\.[0-9]+\.[0-9]+' + - '[0-9]+\.[0-9]+\.[0-9]+-RC[0-9]+' jobs: build-and-release: @@ -18,9 +18,11 @@ jobs: - armhf - arm64 steps: - - name: Checkout + - + name: Checkout uses: actions/checkout@v2 - - name: Set up QEMU + - + name: Set up QEMU uses: docker/setup-qemu-action@v1 - name: Docker meta @@ -29,20 +31,32 @@ jobs: with: images: weetmuts/wmbusmeters tags: type=ref,event=tag - - name: Build + - + name: Build id: build uses: diddlesnaps/snapcraft-multiarch-action@v1 with: architecture: ${{ matrix.architecture }} - - name: Publish release to Stable + - + name: Publish release to Stable uses: snapcore/action-publish@v1 - if: ${{ steps.meta.outputs.tags }} + if: ${{ steps.meta.outputs.tags && !contains(steps.meta.outputs.tags, '-RC') }} env: SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.snapcraft_token }} with: snap: ${{ steps.build.outputs.snap }} release: stable - - name: Publish latest to Edge + - + name: Publish RC to Candidate + uses: snapcore/action-publish@v1 + if: ${{ steps.meta.outputs.tags && contains(steps.meta.outputs.tags, '-RC') }} + env: + SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.snapcraft_token }} + with: + snap: ${{ steps.build.outputs.snap }} + release: candidate + - + name: Publish latest to Edge uses: snapcore/action-publish@v1 if: ${{ !steps.meta.outputs.tags }} env: