From aa50c07088451cb56db3148bc048d6b61533089f Mon Sep 17 00:00:00 2001 From: hazre Date: Thu, 5 Mar 2026 09:11:34 +0100 Subject: [PATCH] ci: update workflows to work with knope monorepo style tags --- .github/workflows/cloudflare-web-deploy.yml | 4 ++-- .github/workflows/docker-publish.yml | 20 ++++++++++++++++---- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cloudflare-web-deploy.yml b/.github/workflows/cloudflare-web-deploy.yml index 552574c4..819851b0 100644 --- a/.github/workflows/cloudflare-web-deploy.yml +++ b/.github/workflows/cloudflare-web-deploy.yml @@ -9,7 +9,7 @@ on: - '.github/actions/setup/**' push: tags: - - 'v*' + - 'sable/v*' workflow_dispatch: env: @@ -57,7 +57,7 @@ jobs: label: production apply: - if: (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')) || github.event_name == 'workflow_dispatch' + if: (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/sable/v')) || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest permissions: contents: read diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index d2c92fc9..c25e47d9 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -4,7 +4,7 @@ on: push: branches: [dev] tags: - - 'v*' + - 'sable/v*' env: REGISTRY: ghcr.io @@ -33,6 +33,18 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Resolve release tag value + id: release_tag + shell: bash + run: | + if [[ "${GITHUB_REF}" == refs/tags/sable/v* ]]; then + echo "value=${GITHUB_REF#refs/tags/sable/}" >> "$GITHUB_OUTPUT" + echo "is_release=true" >> "$GITHUB_OUTPUT" + else + echo "value=" >> "$GITHUB_OUTPUT" + echo "is_release=false" >> "$GITHUB_OUTPUT" + fi + - name: Extract metadata id: meta uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0 @@ -46,9 +58,9 @@ jobs: type=raw,value=latest,enable=${{ github.ref == 'refs/heads/dev' }} # git tags: semver breakdown - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}},enable=${{ !startsWith(github.ref, 'refs/tags/0.') }} + type=semver,pattern={{version}},value=${{ steps.release_tag.outputs.value }},enable=${{ steps.release_tag.outputs.is_release == 'true' }} + type=semver,pattern={{major}}.{{minor}},value=${{ steps.release_tag.outputs.value }},enable=${{ steps.release_tag.outputs.is_release == 'true' }} + type=semver,pattern={{major}},value=${{ steps.release_tag.outputs.value }},enable=${{ steps.release_tag.outputs.is_release == 'true' && !startsWith(steps.release_tag.outputs.value, 'v0.') }} - name: Set up QEMU uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3.7.0