From aa542c92d249426e5389b2d28fd9d09eccee82a9 Mon Sep 17 00:00:00 2001 From: Benoit Lavenier <benoit.lavenier@e-is.pro> Date: Thu, 11 May 2023 17:52:10 +0200 Subject: [PATCH] [fix] Release scripts Fix regexp to version like x.y.z-rc1 --- scripts/release-to-github.sh | 2 +- scripts/release.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/release-to-github.sh b/scripts/release-to-github.sh index 26cabca18..51014a212 100755 --- a/scripts/release-to-github.sh +++ b/scripts/release-to-github.sh @@ -20,7 +20,7 @@ then fi ### Get version to release -current=$(grep -m1 -P "version\": \"\d+.\d+.\d+(-\w+[0-9]+)?" package.json | grep -oP "\d+.\d+.\d+(-\w+[0-9]+)?") +current=$(grep -m1 -P "version\": \"\d+.\d+.\d+(-\w+[0-9]*)?" package.json | grep -oP "\d+.\d+.\d+(-\w+[0-9]*)?") if [[ "_$current" == "_" ]]; then echo " - Make sure the file 'package.json' exists and is readable." echo " - Check version format is: x.y.z (x and y should be an integer)" diff --git a/scripts/release.sh b/scripts/release.sh index 1db46af98..0c8302aa9 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -18,7 +18,7 @@ then fi ### Get current version (package.json) -current=$(grep -oP "version\": \"\d+.\d+.\d+((a|b)[0-9]+)?" package.json | grep -m 1 -oP "\d+.\d+.\d+((a|b)[0-9]+)?") +current=$(grep -m1 -P "version\": \"\d+.\d+.\d+(-\w+[0-9]*)?" package.json | grep -oP "\d+.\d+.\d+(-\w+[0-9]*)?") if [[ "_$current" == "_" ]]; then echo "Unable to read the current version in 'package.json'. Please check version format is: x.y.z (x and y should be an integer)." exit 1; -- GitLab