yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ci: use `-patch.[0-9]+` for patch releases 

Using just `-[0-9]+` requires further changes to the parser in `emqx_release`, and might
also cause problems with Elixir's `Version.parse` depending on the suffix.
This commit is contained in:
Thales Macedo Garitezi 2023-08-09 13:15:58 -03:00
parent cce0d144f9
commit 5294d6b913
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/parse-git-ref.sh
View File

@ -20,7 +20,7 @@ if [[ $1 =~ ^refs/tags/v[5-9]+\.[0-9]+\.[0-9]+$ ]]; then
PROFILE=emqx PROFILE=emqx
RELEASE=true RELEASE=true
LATEST=$(is_latest "$1") 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]+-patch\.[0-9]+$ ]]; then
PROFILE=emqx PROFILE=emqx
RELEASE=true RELEASE=true
LATEST=$(is_latest "$1") LATEST=$(is_latest "$1")
@ -28,7 +28,7 @@ elif [[ $1 =~ ^refs/tags/e[5-9]+\.[0-9]+\.[0-9]+$ ]]; then
PROFILE=emqx-enterprise PROFILE=emqx-enterprise
RELEASE=true RELEASE=true
LATEST=$(is_latest "$1") 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]+-patch\.[0-9]+$ ]]; then
PROFILE=emqx-enterprise PROFILE=emqx-enterprise
RELEASE=true RELEASE=true
LATEST=$(is_latest "$1") LATEST=$(is_latest "$1")

14
scripts/shelltest/parse-git-ref.test
View File

@ -8,12 +8,22 @@ Unrecognized tag: refs/tags/v5.2.0-foobar.1
Unrecognized git ref: v5.2.0 Unrecognized git ref: v5.2.0
>>>= 1 >>>= 1
./parse-git-ref.sh v5.2.0-1
>>>2
Unrecognized git ref: v5.2.0-1
>>>= 1
./parse-git-ref.sh e5.2.0-1
>>>2
Unrecognized git ref: e5.2.0-1
>>>= 1
./parse-git-ref.sh refs/tags/v5.1.0 ./parse-git-ref.sh refs/tags/v5.1.0
>>> >>>
{"profile": "emqx", "release": true, "latest": false} {"profile": "emqx", "release": true, "latest": false}
>>>= 0 >>>= 0
./parse-git-ref.sh refs/tags/v5.1.5-1 ./parse-git-ref.sh refs/tags/v5.1.5-patch.1
>>> >>>
{"profile": "emqx", "release": true, "latest": false} {"profile": "emqx", "release": true, "latest": false}
>>>= 0 >>>= 0
@ -43,7 +53,7 @@ Unrecognized tag: refs/tags/v5.2.0-alpha-1
{"profile": "emqx-enterprise", "release": true, "latest": false} {"profile": "emqx-enterprise", "release": true, "latest": false}
>>>= 0 >>>= 0
./parse-git-ref.sh refs/tags/e5.1.5-1 ./parse-git-ref.sh refs/tags/e5.1.5-patch.1
>>> >>>
{"profile": "emqx-enterprise", "release": true, "latest": false} {"profile": "emqx-enterprise", "release": true, "latest": false}
>>>= 0 >>>= 0