From 42b0a131ce671b57a3ecbc8e8eeaa4cded605019 Mon Sep 17 00:00:00 2001 From: Ivan Dyachkov Date: Wed, 9 Aug 2023 14:45:34 +0200 Subject: [PATCH] fix(semver): use a.b.c-d version pattern instead of a.b.c.d for extra releases --- scripts/parse-git-ref.sh | 4 ++-- scripts/shelltest/parse-git-ref.test | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/parse-git-ref.sh b/scripts/parse-git-ref.sh index 23d88d2eb..5209afcc1 100755 --- a/scripts/parse-git-ref.sh +++ b/scripts/parse-git-ref.sh @@ -20,7 +20,7 @@ if [[ $1 =~ ^refs/tags/v[5-9]+\.[0-9]+\.[0-9]+$ ]]; then PROFILE=emqx RELEASE=true LATEST=$(is_latest "$1") -elif [[ $1 =~ ^refs/tags/v[5-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then +elif [[ $1 =~ ^refs/tags/v[5-9]+\.[0-9]+\.[0-9]+-[0-9]+$ ]]; then PROFILE=emqx RELEASE=true LATEST=$(is_latest "$1") @@ -28,7 +28,7 @@ elif [[ $1 =~ ^refs/tags/e[5-9]+\.[0-9]+\.[0-9]+$ ]]; then PROFILE=emqx-enterprise RELEASE=true LATEST=$(is_latest "$1") -elif [[ $1 =~ ^refs/tags/e[5-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then +elif [[ $1 =~ ^refs/tags/e[5-9]+\.[0-9]+\.[0-9]+-[0-9]+$ ]]; then PROFILE=emqx-enterprise RELEASE=true LATEST=$(is_latest "$1") diff --git a/scripts/shelltest/parse-git-ref.test b/scripts/shelltest/parse-git-ref.test index 14129e5dc..a77f075ad 100644 --- a/scripts/shelltest/parse-git-ref.test +++ b/scripts/shelltest/parse-git-ref.test @@ -13,7 +13,7 @@ Unrecognized git ref: v5.2.0 {"profile": "emqx", "release": true, "latest": false} >>>= 0 -./parse-git-ref.sh refs/tags/v5.1.5.1 +./parse-git-ref.sh refs/tags/v5.1.5-1 >>> {"profile": "emqx", "release": true, "latest": false} >>>= 0 @@ -43,7 +43,7 @@ Unrecognized tag: refs/tags/v5.2.0-alpha-1 {"profile": "emqx-enterprise", "release": true, "latest": false} >>>= 0 -./parse-git-ref.sh refs/tags/e5.1.5.1 +./parse-git-ref.sh refs/tags/e5.1.5-1 >>> {"profile": "emqx-enterprise", "release": true, "latest": false} >>>= 0