From 577be484b89123cda74f52a1d650108c74a79d35 Mon Sep 17 00:00:00 2001
From: Andras Schmelczer <andras@schmelczer.dev>
Date: Sun, 16 Mar 2025 20:45:03 +0000
Subject: [PATCH] Fix docker publishing & version bumping

---
 .github/workflows/publish-docker.yml | 8 ++++----
 scripts/bump-version.sh              | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
index 14516a6..356031d 100644
--- a/.github/workflows/publish-docker.yml
+++ b/.github/workflows/publish-docker.yml
@@ -35,7 +35,7 @@ jobs:
       # Install the cosign tool except on PR
       # https://github.com/sigstore/cosign-installer
       - name: Install cosign
-        if: ${{ github.ref_type == 'tag' }}
+        if: startsWith(github.event.ref, 'refs/tags/')
         uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20 #v3.5.0
         with:
           cosign-release: "v2.2.4"
@@ -49,7 +49,7 @@ jobs:
       # Login against a Docker registry except on PR
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        if: ${{ github.ref_type == 'tag' }}
+        if: startsWith(github.event.ref, 'refs/tags/')
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
@@ -71,7 +71,7 @@ jobs:
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
         with:
           context: backend
-          push: ${{ github.ref_type == 'tag' }}
+          push: startsWith(github.event.ref, 'refs/tags/')
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
@@ -83,7 +83,7 @@ jobs:
       # transparency data even for private images, pass --force to cosign below.
       # https://github.com/sigstore/cosign
       - name: Sign the published Docker image
-        if: ${{ github.ref_type == 'tag' }}
+        if: startsWith(github.event.ref, 'refs/tags/')
         env:
           # https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-an-intermediate-environment-variable
           TAGS: ${{ steps.meta.outputs.tags }}
diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
index 93b33f5..55813bd 100755
--- a/scripts/bump-version.sh
+++ b/scripts/bump-version.sh
@@ -24,11 +24,11 @@ fi
 
 echo "Bumping backend versions"
 cd backend
-cargo set-version --bump patch
+cargo set-version --bump $1
 
 echo "Bumping frontend versions"
 cd ../frontend
-npm version patch --workspaces
+npm version $1 --workspaces
 
 echo "Updating frontend dependencies to match the new backend versions"
 cd ../backend/sync_lib