From b320e6a860bcae5e8a405ce18157310b7e48d92c Mon Sep 17 00:00:00 2001
From: Maciej Lenartowicz <maciej.lenartowicz@nic.cz>
Date: Fri, 11 Oct 2019 10:15:53 +0200
Subject: [PATCH] Changed beta versioning procedure

---
 README.md          | 2 +-
 scripts/publish.sh | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2e1611a..f55d183 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 Each commit to `dev` branch will result in publishing a new version of library
 tagged `beta`. Versions names are based on commit SHA, e.g. 
-`foris@0.1.0-d9073aa4.0`.
+`foris@0.1.0-beta.d9073aa4`.
 
 ### Preparing a release
 
diff --git a/scripts/publish.sh b/scripts/publish.sh
index 4ad76f2..565bde3 100755
--- a/scripts/publish.sh
+++ b/scripts/publish.sh
@@ -10,7 +10,8 @@ else
     echo "unsafe-perm = true" >> ~/.npmrc
     if test "$1" = "beta"
     then
-        npm version prerelease --preid=$CI_COMMIT_SHORT_SHA --git-tag-version false
+        BETA_VERSION=$(npx -c 'echo "$npm_package_version"')-beta.$CI_COMMIT_SHORT_SHA
+        npm version $BETA_VERSION --git-tag-version false
         npm publish --tag beta
     elif test "$1" = "latest"
     then