Просмотр исходного кода

fix(semver): use a.b.c-d version pattern instead of a.b.c.d for extra releases

Ivan Dyachkov 2 лет назад
Родитель
Сommit
42b0a131ce
2 измененных файлов с 4 добавлено и 4 удалено
  1. 2 2
      scripts/parse-git-ref.sh
  2. 2 2
      scripts/shelltest/parse-git-ref.test

+ 2 - 2
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")

+ 2 - 2
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