- tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-update-responses][main] release: new version, 14.0.6
by morgan (＠morgan) 07 Feb '25

07 Feb '25

morgan pushed to branch main at The Tor Project / Applications / Tor Browser update responses Commits: 9a605b6e by Morgan at 2025-02-07T17:32:30+00:00 release: new version, 14.0.6 - - - - - 56 changed files: - update_3/release/.htaccess - − update_3/release/13.5.10-14.0.4+13.5.11-macos-ALL.xml - update_3/release/13.5.9-14.0.5+13.5.12-linux-i686-ALL.xml → update_3/release/13.5.10-14.0.6+13.5.12-linux-i686-ALL.xml - update_3/release/13.5.11-14.0.5+13.5.12-linux-x86_64-ALL.xml → update_3/release/13.5.10-14.0.6+13.5.12-linux-x86_64-ALL.xml - + update_3/release/13.5.10-14.0.6+13.5.12-macos-ALL.xml - update_3/release/13.5.10-14.0.5+13.5.12-windows-i686-ALL.xml → update_3/release/13.5.10-14.0.6+13.5.12-windows-i686-ALL.xml - update_3/release/13.5.10-14.0.5+13.5.12-windows-x86_64-ALL.xml → update_3/release/13.5.10-14.0.6+13.5.12-windows-x86_64-ALL.xml - update_3/release/13.5.10-14.0.5+13.5.12-linux-i686-ALL.xml → update_3/release/13.5.11-14.0.6+13.5.12-linux-i686-ALL.xml - update_3/release/13.5.9-14.0.5+13.5.12-linux-x86_64-ALL.xml → update_3/release/13.5.11-14.0.6+13.5.12-linux-x86_64-ALL.xml - + update_3/release/13.5.11-14.0.6+13.5.12-macos-ALL.xml - update_3/release/13.5.11-14.0.5+13.5.12-windows-i686-ALL.xml → update_3/release/13.5.11-14.0.6+13.5.12-windows-i686-ALL.xml - update_3/release/13.5.11-14.0.5+13.5.12-windows-x86_64-ALL.xml → update_3/release/13.5.11-14.0.6+13.5.12-windows-x86_64-ALL.xml - − update_3/release/13.5.7-14.0.4+13.5.11-macos-ALL.xml - − update_3/release/13.5.9-14.0.4+13.5.11-macos-ALL.xml - update_3/release/14.0.5+13.5.12-linux-i686-ALL.xml → update_3/release/13.5.9-14.0.6+13.5.12-linux-i686-ALL.xml - update_3/release/13.5.10-14.0.5+13.5.12-linux-x86_64-ALL.xml → update_3/release/13.5.9-14.0.6+13.5.12-linux-x86_64-ALL.xml - + update_3/release/13.5.9-14.0.6+13.5.12-macos-ALL.xml - update_3/release/13.5.9-14.0.5+13.5.12-windows-i686-ALL.xml → update_3/release/13.5.9-14.0.6+13.5.12-windows-i686-ALL.xml - update_3/release/13.5.9-14.0.5+13.5.12-windows-x86_64-ALL.xml → update_3/release/13.5.9-14.0.6+13.5.12-windows-x86_64-ALL.xml - − update_3/release/14.0.1-14.0.4+13.5.11-macos-ALL.xml - − update_3/release/14.0.2-14.0.4+13.5.11-macos-ALL.xml - − update_3/release/14.0.2-14.0.5+13.5.12-linux-x86_64-ALL.xml - − update_3/release/14.0.3-14.0.4+13.5.11-macos-ALL.xml - − update_3/release/14.0.3-14.0.5+13.5.12-windows-i686-ALL.xml - update_3/release/14.0.2-14.0.5+13.5.12-linux-i686-ALL.xml → update_3/release/14.0.3-14.0.6+13.5.12-linux-i686-ALL.xml - update_3/release/14.0.3-14.0.5+13.5.12-linux-x86_64-ALL.xml → update_3/release/14.0.3-14.0.6+13.5.12-linux-x86_64-ALL.xml - + update_3/release/14.0.3-14.0.6+13.5.12-macos-ALL.xml - update_3/release/14.0.2-14.0.5+13.5.12-windows-i686-ALL.xml → update_3/release/14.0.3-14.0.6+13.5.12-windows-i686-ALL.xml - update_3/release/14.0.2-14.0.5+13.5.12-windows-x86_64-ALL.xml → update_3/release/14.0.3-14.0.6+13.5.12-windows-x86_64-ALL.xml - − update_3/release/14.0.4+13.5.11-macos-ALL.xml - − update_3/release/14.0.4-14.0.5+13.5.12-windows-x86_64-ALL.xml - update_3/release/14.0.4-14.0.5+13.5.12-linux-i686-ALL.xml → update_3/release/14.0.4-14.0.6+13.5.12-linux-i686-ALL.xml - update_3/release/14.0.4-14.0.5+13.5.12-linux-x86_64-ALL.xml → update_3/release/14.0.4-14.0.6+13.5.12-linux-x86_64-ALL.xml - + update_3/release/14.0.4-14.0.6+13.5.12-macos-ALL.xml - update_3/release/14.0.4-14.0.5+13.5.12-windows-i686-ALL.xml → update_3/release/14.0.4-14.0.6+13.5.12-windows-i686-ALL.xml - update_3/release/14.0.3-14.0.5+13.5.12-windows-x86_64-ALL.xml → update_3/release/14.0.4-14.0.6+13.5.12-windows-x86_64-ALL.xml - update_3/release/14.0.3-14.0.5+13.5.12-linux-i686-ALL.xml → update_3/release/14.0.5-14.0.6+13.5.12-linux-i686-ALL.xml - + update_3/release/14.0.5-14.0.6+13.5.12-linux-x86_64-ALL.xml - + update_3/release/14.0.5-14.0.6+13.5.12-macos-ALL.xml - + update_3/release/14.0.5-14.0.6+13.5.12-windows-i686-ALL.xml - + update_3/release/14.0.5-14.0.6+13.5.12-windows-x86_64-ALL.xml - update_3/release/13.5.11-14.0.5+13.5.12-linux-i686-ALL.xml → update_3/release/14.0.6+13.5.12-linux-i686-ALL.xml - update_3/release/14.0.5+13.5.12-linux-x86_64-ALL.xml → update_3/release/14.0.6+13.5.12-linux-x86_64-ALL.xml - + update_3/release/14.0.6+13.5.12-macos-ALL.xml - update_3/release/14.0.5+13.5.12-windows-i686-ALL.xml → update_3/release/14.0.6+13.5.12-windows-i686-ALL.xml - update_3/release/14.0.5+13.5.12-windows-x86_64-ALL.xml → update_3/release/14.0.6+13.5.12-windows-x86_64-ALL.xml - update_3/release/download-android-aarch64.json - update_3/release/download-android-armv7.json - update_3/release/download-android-x86.json - update_3/release/download-android-x86_64.json - update_3/release/download-linux-i686.json - update_3/release/download-linux-x86_64.json - update_3/release/download-macos.json - update_3/release/download-windows-i686.json - update_3/release/download-windows-x86_64.json - update_3/release/downloads.json The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-update-responses… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-128.7.0esr-14.0-1-build3
by morgan (＠morgan) 06 Feb '25

06 Feb '25

morgan pushed new tag tor-browser-128.7.0esr-14.0-1-build3 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.7.0esr-14.0-1] BB 43468: ScreenCaptureKit should be a weak link.
by morgan (＠morgan) 06 Feb '25

06 Feb '25

morgan pushed to branch mullvad-browser-128.7.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 0100be62 by Pier Angelo Vendrame at 2025-02-06T18:28:13+00:00 BB 43468: ScreenCaptureKit should be a weak link. ScreenCaptureKit is not available on older macOS versions. For some reason, the upstream build have it as a weak import even though they do not specify the -weak_framework flag, whereas our builds have it as a normal import and do not work on macOS 10.15 without this patch. - - - - - 1 changed file: - toolkit/library/moz.build Changes: ===================================== toolkit/library/moz.build ===================================== @@ -228,7 +228,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": "-framework AVFoundation", "-framework CoreMedia", "-framework IOKit", - "-framework ScreenCaptureKit", + "-weak_framework ScreenCaptureKit", "-F%s" % CONFIG["MACOS_PRIVATE_FRAMEWORKS_DIR"], "-framework CoreUI", "-framework CoreSymbolication", View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/010… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/010… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.7.0esr-14.0-1] BB 43468: ScreenCaptureKit should be a weak link.
by morgan (＠morgan) 06 Feb '25

06 Feb '25

morgan pushed to branch base-browser-128.7.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: ca7de33e by Pier Angelo Vendrame at 2025-02-06T18:25:29+00:00 BB 43468: ScreenCaptureKit should be a weak link. ScreenCaptureKit is not available on older macOS versions. For some reason, the upstream build have it as a weak import even though they do not specify the -weak_framework flag, whereas our builds have it as a normal import and do not work on macOS 10.15 without this patch. - - - - - 1 changed file: - toolkit/library/moz.build Changes: ===================================== toolkit/library/moz.build ===================================== @@ -228,7 +228,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": "-framework AVFoundation", "-framework CoreMedia", "-framework IOKit", - "-framework ScreenCaptureKit", + "-weak_framework ScreenCaptureKit", "-F%s" % CONFIG["MACOS_PRIVATE_FRAMEWORKS_DIR"], "-framework CoreUI", "-framework CoreSymbolication", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ca7de33… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ca7de33… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.0-1] BB 43468: ScreenCaptureKit should be a weak link.
by morgan (＠morgan) 06 Feb '25

06 Feb '25

morgan pushed to branch tor-browser-128.7.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 3eb91e73 by Pier Angelo Vendrame at 2025-02-06T18:27:01+00:00 BB 43468: ScreenCaptureKit should be a weak link. ScreenCaptureKit is not available on older macOS versions. For some reason, the upstream build have it as a weak import even though they do not specify the -weak_framework flag, whereas our builds have it as a normal import and do not work on macOS 10.15 without this patch. - - - - - 1 changed file: - toolkit/library/moz.build Changes: ===================================== toolkit/library/moz.build ===================================== @@ -228,7 +228,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": "-framework AVFoundation", "-framework CoreMedia", "-framework IOKit", - "-framework ScreenCaptureKit", + "-weak_framework ScreenCaptureKit", "-F%s" % CONFIG["MACOS_PRIVATE_FRAMEWORKS_DIR"], "-framework CoreUI", "-framework CoreSymbolication", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3eb91e7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3eb91e7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.7.0esr-14.5-1] BB 43468: ScreenCaptureKit should be a weak link.
by morgan (＠morgan) 06 Feb '25

06 Feb '25

morgan pushed to branch mullvad-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser Commits: f31aff63 by Pier Angelo Vendrame at 2025-02-06T18:24:38+00:00 BB 43468: ScreenCaptureKit should be a weak link. ScreenCaptureKit is not available on older macOS versions. For some reason, the upstream build have it as a weak import even though they do not specify the -weak_framework flag, whereas our builds have it as a normal import and do not work on macOS 10.15 without this patch. - - - - - 1 changed file: - toolkit/library/moz.build Changes: ===================================== toolkit/library/moz.build ===================================== @@ -228,7 +228,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": "-framework AVFoundation", "-framework CoreMedia", "-framework IOKit", - "-framework ScreenCaptureKit", + "-weak_framework ScreenCaptureKit", "-F%s" % CONFIG["MACOS_PRIVATE_FRAMEWORKS_DIR"], "-framework CoreUI", "-framework CoreSymbolication", View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/f31… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/f31… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.7.0esr-14.5-1] BB 43468: ScreenCaptureKit should be a weak link.
by morgan (＠morgan) 06 Feb '25

06 Feb '25

morgan pushed to branch base-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 6e19b43b by Pier Angelo Vendrame at 2025-02-06T18:20:34+00:00 BB 43468: ScreenCaptureKit should be a weak link. ScreenCaptureKit is not available on older macOS versions. For some reason, the upstream build have it as a weak import even though they do not specify the -weak_framework flag, whereas our builds have it as a normal import and do not work on macOS 10.15 without this patch. - - - - - 1 changed file: - toolkit/library/moz.build Changes: ===================================== toolkit/library/moz.build ===================================== @@ -228,7 +228,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": "-framework AVFoundation", "-framework CoreMedia", "-framework IOKit", - "-framework ScreenCaptureKit", + "-weak_framework ScreenCaptureKit", "-F%s" % CONFIG["MACOS_PRIVATE_FRAMEWORKS_DIR"], "-framework CoreUI", "-framework CoreSymbolication", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6e19b43… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6e19b43… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] BB 43468: ScreenCaptureKit should be a weak link.
by Pier Angelo Vendrame (＠pierov) 06 Feb '25

06 Feb '25

Pier Angelo Vendrame pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 15c7cc7f by Pier Angelo Vendrame at 2025-02-06T18:15:12+00:00 BB 43468: ScreenCaptureKit should be a weak link. ScreenCaptureKit is not available on older macOS versions. For some reason, the upstream build have it as a weak import even though they do not specify the -weak_framework flag, whereas our builds have it as a normal import and do not work on macOS 10.15 without this patch. - - - - - 1 changed file: - toolkit/library/moz.build Changes: ===================================== toolkit/library/moz.build ===================================== @@ -228,7 +228,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa": "-framework AVFoundation", "-framework CoreMedia", "-framework IOKit", - "-framework ScreenCaptureKit", + "-weak_framework ScreenCaptureKit", "-F%s" % CONFIG["MACOS_PRIVATE_FRAMEWORKS_DIR"], "-framework CoreUI", "-framework CoreSymbolication", View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/15c7cc7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/15c7cc7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.7.0esr-14.5-1] fixup! TB 2176: Rebrand Firefox to TorBrowser
by morgan (＠morgan) 06 Feb '25

06 Feb '25

morgan pushed to branch tor-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: f3f6359d by Henry Wilkes at 2025-02-05T14:21:28+00:00 fixup! TB 2176: Rebrand Firefox to TorBrowser TB 43466: Drop unnecessary changes to the aboutDialog.css stylesheet. Common branding rules common to tor browser releases were moved to the existing aboutDialogTor.css. Duplicate rules that were already in browser/base/content/aboutDialog.css were dropped. Rules that only made a minor difference were dropped: 1. We now centre-align the logo, instead of right-aligning (which did not seem to work as intended in right-to-left locales). 2. We keep the logo at the default 192px size, rather than 180px, which is a 0.75 scaling of the original 256px PNG. 3. We use the default size between the wordmark and "Extended Support Release", which increases the gap by 6px. - - - - - 4 changed files: - browser/base/content/aboutDialogTor.css - browser/branding/tb-alpha/content/aboutDialog.css - browser/branding/tb-nightly/content/aboutDialog.css - browser/branding/tb-release/content/aboutDialog.css Changes: ===================================== browser/base/content/aboutDialogTor.css ===================================== @@ -1,20 +1,22 @@ +#aboutDialogContainer { + background-color: #20123a; + color: #fff; + color-scheme: dark; +} + #leftBox { background-image: url('chrome://branding/content/icon256.png'); - background-position: right top; - background-size: 180px; + background-position-y: 0; } #rightBox { background-size: auto; - padding-top: 32px; -} - -#contributeDesc { - display: none; + margin-inline: 30px; } -#communityDesc { - display: none; +#bottomBox { + background-color: hsla(235, 43%, 10%, .5); + padding: 15px 10px 15px; } #trademark { @@ -24,6 +26,14 @@ margin-block: 10px; } +#contributeDesc { + display: none; +} + +#communityDesc { + display: none; +} + #bottomBox > hbox:not(#newBottom) { display: none; } ===================================== browser/branding/tb-alpha/content/aboutDialog.css ===================================== @@ -2,47 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#aboutDialogContainer { - background-color: #20123a; - color: #fff; -} - -#clientBox { - padding: 10px 0 15px; -} - -#leftBox { - background-image: url("chrome://branding/content/about-logo.png"); - background-repeat: no-repeat; - background-size: 192px auto; - background-position: center 20%; - /* min-width and min-height create room for the logo */ - min-width: 210px; - min-height: 210px; - margin-top: 20px; - margin-inline-start: 30px; -} - -@media (min-resolution: 2dppx) { - #leftBox { - background-image: url("chrome://branding/content/about-logo@2x.png"); - } -} - -.text-link { - color: #fff !important; - text-decoration: underline; -} - -.text-link:-moz-focusring { - border-color: #fff; -} - -#rightBox { - margin-inline: 30px; - padding-top: 64px; -} - #rightBox:-moz-locale-dir(rtl) { /* tor-browser#42319: re-align the background image after we added some padding to make all the channel use the same size for the wordmark. @@ -50,8 +9,3 @@ (tor-browser#29745) */ background-position: right -34px top 0; } - -#bottomBox { - background-color: hsla(235, 43%, 10%, .5); - padding: 15px 10px 15px; -} ===================================== browser/branding/tb-nightly/content/aboutDialog.css ===================================== @@ -1,46 +1,3 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#aboutDialogContainer { - background-color: #20123a; - color: #fff; - color-scheme: dark; -} - -#clientBox { - padding: 10px 0 15px; -} - -#leftBox { - background-image: url("chrome://branding/content/about-logo.png"); - background-repeat: no-repeat; - background-size: 192px auto; - background-position: center 20%; - /* min-width and min-height create room for the logo */ - min-width: 210px; - min-height: 210px; - margin-top: 20px; - margin-inline-start: 30px; -} - -@media (min-resolution: 2dppx) { - #leftBox { - background-image: url("chrome://branding/content/about-logo@2x.png"); - } -} - -.text-link { - color: #fff !important; - text-decoration: underline; -} - -#rightBox { - margin-inline: 30px; - padding-top: 64px; -} - -#bottomBox { - background-color: hsla(235, 43%, 10%, .5); - padding: 15px 10px 15px; -} ===================================== browser/branding/tb-release/content/aboutDialog.css ===================================== @@ -2,43 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#aboutDialogContainer { - background-color: #20123a; - color: #fff; - color-scheme: dark; -} - -#clientBox { - padding: 10px 0 15px; -} - -#leftBox { - background-image: url("chrome://branding/content/about-logo.png"); - background-repeat: no-repeat; - background-size: 192px auto; - background-position: center 20%; - /* min-width and min-height create room for the logo */ - min-width: 210px; - min-height: 210px; - margin-top: 20px; - margin-inline-start: 30px; -} - -@media (min-resolution: 2dppx) { - #leftBox { - background-image: url("chrome://branding/content/about-logo@2x.png"); - } -} - -.text-link { - color: #fff !important; - text-decoration: underline; -} - -#rightBox { - margin-inline: 30px; -} - #rightBox:-moz-locale-dir(rtl) { /* tor-browser#42319: re-align the background image after we added some padding to make all the channel use the same size for the wordmark. @@ -46,15 +9,3 @@ (tor-browser#29745) */ background-position: right -164px top 0; } - -#bottomBox { - background-color: hsla(235, 43%, 10%, .5); - padding: 15px 10px 15px; -} - -#trademark { - font-size: xx-small; - text-align: center; - color: #999999; - margin-block: 10px; -} View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f3f6359… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f3f6359… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41358: Update sign-tag script to handle rapid-release nightly branches
by morgan (＠morgan) 06 Feb '25

06 Feb '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 8833b2b8 by Morgan at 2025-02-06T17:52:43+00:00 Bug 41358: Update sign-tag script to handle rapid-release nightly branches - - - - - 1 changed file: - tools/browser/sign-tag Changes: ===================================== tools/browser/sign-tag ===================================== @@ -34,11 +34,11 @@ esac # branch_name=$(git rev-parse --abbrev-ref HEAD) -if [[ $branch_name =~ ^([a-z]+-browser)-([1-9][0-9]+\.[0-9]+\.[0-9]+esr)-([1-9][0-9]*\.[05])-([1-9]).*$ ]]; then +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 project="${BASH_REMATCH[1]}" - esr="${BASH_REMATCH[2]}" - version="${BASH_REMATCH[3]}" - branch_number="${BASH_REMATCH[4]}" + upstream="${BASH_REMATCH[2]}${BASH_REMATCH[3]}" + version="${BASH_REMATCH[4]}" + branch_number="${BASH_REMATCH[5]}" else echo "This script must be run from an official browser branch. For example 'base-browser-128.4.0esr-14.0-1'" exit 1 @@ -77,9 +77,9 @@ commit=$(git rev-parse --short ${3:-HEAD}) # channel validation if [[ "${project}" == "mullvad-browser" ]]; then - valid_channels=("alpha" "stable") + valid_channels=("rapid" "alpha" "stable") else - valid_channels=("alpha" "stable" "legacy") + valid_channels=("rapid" "alpha" "stable" "legacy") fi channel_valid=false for value in "${valid_channels[@]}"; do @@ -104,8 +104,8 @@ fi # Sign and tag the specified git commit # -tag="${project}-${esr}-${version}-${branch_number}-${build_number}" -message="Tagging ${build_number} for ${esr}-based ${channel}" +tag="${project}-${upstream}-${version}-${branch_number}-${build_number}" +message="Tagging ${build_number} for ${upstream}-based ${channel}" echo "Tag commit ${commit} in ${branch_name}" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8… You're receiving this email because of your account on gitlab.torproject.org.

1 0