From 74fc2fcfa93b1c9efc342d58892faae45ac564ab Mon Sep 17 00:00:00 2001
From: Christian Klemm <git@klemm.one>
Date: Sat, 30 Nov 2019 23:48:02 +0100
Subject: [PATCH] Release tag fixes

---
 .github/workflows/release-publish.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 64cb67177..32eec513f 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -25,14 +25,16 @@ jobs:
 
     - name: Prepare release
       run: |
-        echo "Preparing release ${GITHUB_REF}"
+        echo "Preparing release ${GITHUB_REF:10}"
+        npm version --no-git-tag-version --allow-same-version ${GITHUB_REF:10}
+        git add package.json
+        git commit -m "Bump version ${GITHUB_REF:10}"
         git checkout master
-        git merge -m "Release ${GITHUB_REF}" --no-ff release/${GITHUB_REF}
-        git push --delete release/${GITHUB_REF}
+        git merge -m "Release ${GITHUB_REF:10}" --no-ff release/${GITHUB_REF:10}
+        git push --delete release/${GITHUB_REF:10}
 
     - name: Publish
       run: |
-        npm version --no-git-tag-version --allow-same-version ${GITHUB_REF}
         npm set //registry.npmjs.org/:_authToken ${{ secrets.GITHUB_TOKEN }}
         npm publish