| ... |
... |
@@ -25,13 +25,13 @@ TARGET="--target $CHANNEL --target mullvadbrowser-linux-x86_64" |
|
25
|
25
|
MB_TAG=$(showconf firefox git_hash $TARGET)
|
|
26
|
26
|
MB_BRANCH=${MB_TAG//-build[0-9]*/}
|
|
27
|
27
|
BB_BRANCH=${MB_BRANCH//mullvad-/base-}
|
|
28
|
|
-ESR_VERSION=$(showconf firefox var/firefox_version $TARGET)
|
|
|
28
|
+FX_VERSION=$(showconf firefox var/firefox_version $TARGET)
|
|
29
|
29
|
BASE_VERSION=$(showconf release var/torbrowser_version $TARGET)
|
|
30
|
30
|
RELEASE_VERSION="${BASE_VERSION}${mbrtag_suffix}"
|
|
31
|
31
|
RELEASE_URL="https://dist.torproject.org/mullvadbrowser/${RELEASE_VERSION}/"
|
|
32
|
32
|
if ! curl -f "$RELEASE_URL" >/dev/null 2>&1 ; then
|
|
33
|
33
|
echo >&2 "$RELEASE_URL not found! Maybe you need to run:"
|
|
34
|
|
- echo >&2 "ssh staticiforme.torproject.org 'cd /srv/dist-master.torproject.org/htdocs/mullvadbrowser && static-update-component dist.torproject.org'"
|
|
|
34
|
+ echo >&2 "ssh staticiforme.torproject.org 'static-update-component dist.torproject.org' && $0"
|
|
35
|
35
|
exit 2
|
|
36
|
36
|
fi
|
|
37
|
37
|
pushd >/dev/null ../../git_clones/firefox
|
| ... |
... |
@@ -39,8 +39,9 @@ echo "Fetching $MB_BRANCH and tags..." |
|
39
|
39
|
git fetch --tags "$GL_REMOTE_MULLVAD" "$MB_BRANCH"
|
|
40
|
40
|
git fetch --tags "$GL_REMOTE_TOR" "$BB_BRANCH"
|
|
41
|
41
|
BB_TAG=$(git tag -l "$BB_BRANCH-build*" | tail -n1)
|
|
42
|
|
-FX_TAG=$(git tag -l "FIREFOX_${ESR_VERSION//\./_}*" | tail -n1)
|
|
|
42
|
+FX_TAG=$(git tag -l "FIREFOX_*${FX_VERSION//\./_}*" "FIREFOX_NIGHTLY_${FX_VERSION//\.0a[0-9]*/}*" | tail -n1)
|
|
43
|
43
|
echo "QA build version: $BASE_VERSION"
|
|
|
44
|
+echo "Firefox version: $FX_VERSION"
|
|
44
|
45
|
echo "MB tag: $MB_TAG"
|
|
45
|
46
|
echo "BB tag: $BB_TAG"
|
|
46
|
47
|
echo "FX tag: $FX_TAG"
|
| ... |
... |
@@ -53,7 +54,7 @@ if ! [[ $REPLY =~ ^[Yy]$ ]]; then |
|
53
|
54
|
fi
|
|
54
|
55
|
|
|
55
|
56
|
git checkout $MB_TAG
|
|
56
|
|
-[[ $(git tag -l $RELEASE_VERSION) ]] || git tag -s $RELEASE_VERSION -m"$ESR_VERSION-based $RELEASE_VERSION"
|
|
|
57
|
+[[ $(git tag -l $RELEASE_VERSION) ]] || git tag -s $RELEASE_VERSION -m"$FX_VERSION-based $RELEASE_VERSION"
|
|
57
|
58
|
git tag -n1 $RELEASE_VERSION
|
|
58
|
59
|
git push "$GH_REMOTE" "HEAD:refs/heads/$MB_BRANCH"
|
|
59
|
60
|
git push "$GH_REMOTE" "$FX_TAG"
|