| ... |
... |
@@ -16,7 +16,8 @@ fi |
|
16
|
16
|
|
|
17
|
17
|
set -e
|
|
18
|
18
|
|
|
19
|
|
-GL_REMOTE=git@gitlab.torproject.org:tpo/applications/mullvad-browser.git
|
|
|
19
|
+GL_REMOTE_TOR=git@gitlab.torproject.org:tpo/applications/tor-browser.git
|
|
|
20
|
+GL_REMOTE_MULLVAD=git@gitlab.torproject.org:tpo/applications/mullvad-browser.git
|
|
20
|
21
|
GH_REMOTE=git@github.com:mullvad/mullvad-browser.git
|
|
21
|
22
|
CLONE_DIR="$TBB_DIR/git_clones/firefox"
|
|
22
|
23
|
CHANNEL=$(showconf release var/browser_default_channel)
|
| ... |
... |
@@ -29,7 +30,8 @@ BASE_VERSION=$(showconf release var/torbrowser_version $TARGET) |
|
29
|
30
|
RELEASE_VERSION="${BASE_VERSION}${mbrtag_suffix}"
|
|
30
|
31
|
pushd >/dev/null ../../git_clones/firefox
|
|
31
|
32
|
echo "Fetching $MB_BRANCH and tags..."
|
|
32
|
|
-git fetch --tags "$GL_REMOTE" "$MB_BRANCH"
|
|
|
33
|
+git fetch --tags "$GL_REMOTE_MULLVAD" "$MB_BRANCH"
|
|
|
34
|
+git fetch --tags "$GL_REMOTE_TOR" "$BB_BRANCH"
|
|
33
|
35
|
BB_TAG=$(git tag -l "$BB_BRANCH-build*" | tail -n1)
|
|
34
|
36
|
FX_TAG=$(git tag -l "FIREFOX_${ESR_VERSION//\./_}*" | tail -n1)
|
|
35
|
37
|
echo "QA build version: $BASE_VERSION"
|
| ... |
... |
@@ -43,13 +45,15 @@ if ! [[ $REPLY =~ ^[Yy]$ ]]; then |
|
43
|
45
|
echo >&2 "Operation cancelled"
|
|
44
|
46
|
exit 1
|
|
45
|
47
|
fi
|
|
|
48
|
+
|
|
46
|
49
|
git checkout $MB_TAG
|
|
47
|
|
-git tag -s $RELEASE_VERSION -m"$ESR_VERSION-based $RELEASE_VERSION"
|
|
|
50
|
+[[ $(git tag -l $RELEASE_VERSION) ]] || git tag -s $RELEASE_VERSION -m"$ESR_VERSION-based $RELEASE_VERSION"
|
|
48
|
51
|
git tag -n1 $RELEASE_VERSION
|
|
49
|
52
|
git push "$GH_REMOTE" "HEAD:refs/heads/$MB_BRANCH"
|
|
50
|
53
|
git push "$GH_REMOTE" "$FX_TAG"
|
|
51
|
54
|
git push "$GH_REMOTE" "$BB_TAG"
|
|
52
|
55
|
git push "$GH_REMOTE" "$RELEASE_VERSION"
|
|
|
56
|
+
|
|
53
|
57
|
popd >/dev/null
|
|
54
|
58
|
|
|
55
|
59
|
# Call Mullvad's github workflow for new releases (mullvad-browser#466)
|