ma1 pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 2e960b45 by hackademix at 2025-07-31T11:25:41+02:00 Bug 41529: Automate publishing browser release branch and tags to Mullvad repository - - - - - 3 changed files: - .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md - .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md - + tools/signing/publish-github.mullvadbrowser Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -173,21 +173,10 @@ Mullvad Browser Alpha (and Nightly) are on the `main` branch - ma1 - morgan - pierov -- [ ] Sign+Tag additionally the `mullvad-browser.git` `firefox` commit used in build: - - **Tag**: `${MULLVAD_BROWSER_VERSION}` - - **example**: `12.5a7` - - **Message**: `${ESR_VERSION}esr-based ${MULLVAD_BROWSER_VERSION}` - - **example**: `102.12.0esr-based 12.5a7` -- [ ] Push this release's associated `mullvad-browser.git` branch to github -- [ ] Push this release's associated tags to github: - - [ ] Firefox ESR tag - - **example**: `FIREFOX_102_12_0esr_BUILD1` - - [ ] `base-browser` tag - - **example**: `base-browser-102.12.0esr-12.0-1-build1` - - [ ] `mullvad-browser` build tag - - **example**: `mullvad-browser-102.12.0esr-12.0-1-build1` - - [ ] `mullvad-browser` release tag - - **example**: `12.0.11` +- [ ] Run: + ```bash + cd tor-browser-build/tools/signing/ && ./publish-github.mullvadbrowser + ``` </details> ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md ===================================== @@ -176,21 +176,10 @@ Mullvad Browser Stable is on the `maint-${MULLVAD_BROWSER_MAJOR}.${MULLVAD_BROWS - ma1 - morgan - pierov -- [ ] Sign+Tag additionally the `mullvad-browser.git` `firefox` commit used in build: - - **Tag**: `${MULLVAD_BROWSER_VERSION}` - - **example**: `12.5a7` - - **Message**: `${ESR_VERSION}esr-based ${MULLVAD_BROWSER_VERSION}` - - **example**: `102.12.0esr-based 12.5a7` -- [ ] Push this release's associated `mullvad-browser.git` branch to github -- [ ] Push this release's associated tags to github: - - [ ] Firefox ESR tag - - **example**: `FIREFOX_102_12_0esr_BUILD1` - - [ ] `base-browser` tag - - **example**: `base-browser-102.12.0esr-12.0-1-build1` - - [ ] `mullvad-browser` build tag - - **example**: `mullvad-browser-102.12.0esr-12.0-1-build1` - - [ ] `mullvad-browser` release tag - - **example**: `12.0.11` +- [ ] Run: + ```bash + cd tor-browser-build/tools/signing/ && ./publish-github.mullvadbrowser + ``` </details> ===================================== tools/signing/publish-github.mullvadbrowser ===================================== @@ -0,0 +1,39 @@ +#!/bin/bash +SCRIPT_DIR=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd) +TBB_DIR="$SCRIPT_DIR/../.." +function showconf { + "$TBB_DIR/rbm/rbm" showconf $@ +} +GL_REMOTE=git@gitlab.torproject.org:tpo/applications/mullvad-browser.git +GH_REMOTE=git@github.com:mullvad/mullvad-browser.git +CLONE_DIR="$TBB_DIR/git_clones/firefox" +CHANNEL=$(showconf release var/browser_default_channel) +TARGET="--target $CHANNEL --target mullvadbrowser-linux-x86_64" +MB_TAG=$(showconf firefox git_hash $TARGET) +MB_BRANCH=${MB_TAG//-build[0-9]*/} +BB_BRANCH=${MB_BRANCH//mullvad-/base-} +ESR_VERSION=$(showconf firefox var/firefox_version $TARGET) +RELEASE_VERSION=$(showconf release var/torbrowser_version $TARGET) +pushd >/dev/null ../../git_clones/firefox +echo "Fetching $MB_BRANCH and tags..." +git fetch --tags "$GL_REMOTE" "$MB_BRANCH" +BB_TAG=$(git tag -l "$BB_BRANCH-build*" | tail -n1) +FX_TAG=$(git tag -l "FIREFOX_${ESR_VERSION//\./_}*" | tail -n1) +echo "MB tag: $MB_TAG" +echo "BB tag: $BB_TAG" +echo "FX tag: $FX_TAG" +echo "Mullvad release tag: $RELEASE_VERSION" +read -p "Do you want to tag mullvad $RELEASE_VERSION and push everything to ${GH_REMOTE}? (y/N) " -n 1 -r +echo +if ! [[ $REPLY =~ ^[Yy]$ ]]; then + echo >&2 "Operation cancelled" + exit 1 +fi +git checkout $MB_TAG +git tag -s $RELEASE_VERSION -m"$ESR_VERSION-based $RELEASE_VERSION" +git tag -n1 $RELEASE_VERSION +git push "$GH_REMOTE" "HEAD:refs/heads/$MB_BRANCH" +git push "$GH_REMOTE" "$FX_TAG" +git push "$GH_REMOTE" "$BB_TAG" +git push "$GH_REMOTE" "$RELEASE_VERSION" +popd >/dev/null View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2e... -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2e... You're receiving this email because of your account on gitlab.torproject.org.