| ... |
... |
@@ -34,11 +34,11 @@ esac |
|
34
|
34
|
#
|
|
35
|
35
|
|
|
36
|
36
|
branch_name=$(git rev-parse --abbrev-ref HEAD)
|
|
37
|
|
-if [[ $branch_name =~ ^([a-z]+-browser)-([1-9][0-9]+\.[0-9]+\.[0-9]+esr)-([1-9][0-9]*\.[05])-([1-9]).*$ ]]; then
|
|
|
37
|
+if [[ $branch_name =~ ^([a-z]+-browser)-([1-9][0-9]+\.[0-9]+)(\.[0-9]+esr|a[1-9][0-9]*)-([1-9][0-9]*\.[05])-([1-9]).*$ ]]; then
|
|
38
|
38
|
project="${BASH_REMATCH[1]}"
|
|
39
|
|
- esr="${BASH_REMATCH[2]}"
|
|
40
|
|
- version="${BASH_REMATCH[3]}"
|
|
41
|
|
- branch_number="${BASH_REMATCH[4]}"
|
|
|
39
|
+ upstream="${BASH_REMATCH[2]}${BASH_REMATCH[3]}"
|
|
|
40
|
+ version="${BASH_REMATCH[4]}"
|
|
|
41
|
+ branch_number="${BASH_REMATCH[5]}"
|
|
42
|
42
|
else
|
|
43
|
43
|
echo "This script must be run from an official browser branch. For example 'base-browser-128.4.0esr-14.0-1'"
|
|
44
|
44
|
exit 1
|
| ... |
... |
@@ -77,9 +77,9 @@ commit=$(git rev-parse --short ${3:-HEAD}) |
|
77
|
77
|
|
|
78
|
78
|
# channel validation
|
|
79
|
79
|
if [[ "${project}" == "mullvad-browser" ]]; then
|
|
80
|
|
- valid_channels=("alpha" "stable")
|
|
|
80
|
+ valid_channels=("rapid" "alpha" "stable")
|
|
81
|
81
|
else
|
|
82
|
|
- valid_channels=("alpha" "stable" "legacy")
|
|
|
82
|
+ valid_channels=("rapid" "alpha" "stable" "legacy")
|
|
83
|
83
|
fi
|
|
84
|
84
|
channel_valid=false
|
|
85
|
85
|
for value in "${valid_channels[@]}"; do
|
| ... |
... |
@@ -104,8 +104,8 @@ fi |
|
104
|
104
|
# Sign and tag the specified git commit
|
|
105
|
105
|
#
|
|
106
|
106
|
|
|
107
|
|
-tag="${project}-${esr}-${version}-${branch_number}-${build_number}"
|
|
108
|
|
-message="Tagging ${build_number} for ${esr}-based ${channel}"
|
|
|
107
|
+tag="${project}-${upstream}-${version}-${branch_number}-${build_number}"
|
|
|
108
|
+message="Tagging ${build_number} for ${upstream}-based ${channel}"
|
|
109
|
109
|
|
|
110
|
110
|
|
|
111
|
111
|
echo "Tag commit ${commit} in ${branch_name}"
|