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.
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.
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.
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.
ma1 pushed to branch mullvad-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser
Commits:
27ef9572 by Henry Wilkes at 2025-02-03T17:59:01+01:00
fixup! BB 42716: Disable unwanted about: pages
TB 43308: Remove about:logo which exposes a branding asset.
- - - - -
1 changed file:
- docshell/base/nsAboutRedirector.cpp
Changes:
=====================================
docshell/base/nsAboutRedirector.cpp
=====================================
@@ -123,10 +123,9 @@ static const RedirEntry kRedirMap[] = {
nsIAboutModule::IS_SECURE_CHROME_UI},
{"logging", "chrome://global/content/aboutLogging.html",
nsIAboutModule::ALLOW_SCRIPT},
- {"logo", "chrome://branding/content/about.png",
- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
- // Linkable for testing reasons.
- nsIAboutModule::MAKE_LINKABLE},
+ // Do not allow web pages to link to about:logo, which varies between
+ // channels. See tor-browser#43308.
+ // Moreover, it exposes firefox-specific branding.
{"memory", "chrome://global/content/aboutMemory.xhtml",
nsIAboutModule::ALLOW_SCRIPT},
{"certificate", "chrome://global/content/certviewer/certviewer.html",
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/27e…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/27e…
You're receiving this email because of your account on gitlab.torproject.org.
ma1 pushed to branch base-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
d2b1cdb2 by Henry Wilkes at 2025-02-03T17:58:41+01:00
fixup! BB 42716: Disable unwanted about: pages
TB 43308: Remove about:logo which exposes a branding asset.
- - - - -
1 changed file:
- docshell/base/nsAboutRedirector.cpp
Changes:
=====================================
docshell/base/nsAboutRedirector.cpp
=====================================
@@ -123,10 +123,9 @@ static const RedirEntry kRedirMap[] = {
nsIAboutModule::IS_SECURE_CHROME_UI},
{"logging", "chrome://global/content/aboutLogging.html",
nsIAboutModule::ALLOW_SCRIPT},
- {"logo", "chrome://branding/content/about.png",
- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT |
- // Linkable for testing reasons.
- nsIAboutModule::MAKE_LINKABLE},
+ // Do not allow web pages to link to about:logo, which varies between
+ // channels. See tor-browser#43308.
+ // Moreover, it exposes firefox-specific branding.
{"memory", "chrome://global/content/aboutMemory.xhtml",
nsIAboutModule::ALLOW_SCRIPT},
{"certificate", "chrome://global/content/certviewer/certviewer.html",
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d2b1cdb…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d2b1cdb…
You're receiving this email because of your account on gitlab.torproject.org.
ma1 pushed to branch mullvad-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser
Commits:
911dbf28 by Henry Wilkes at 2025-02-03T17:56:38+01:00
BB 29745: Limit remote access to content accessible resources
- - - - -
1 changed file:
- caps/nsScriptSecurityManager.cpp
Changes:
=====================================
caps/nsScriptSecurityManager.cpp
=====================================
@@ -1044,6 +1044,48 @@ nsresult nsScriptSecurityManager::CheckLoadURIFlags(
}
}
+ // Only allow some "about:" pages to have access to contentaccessible
+ // "chrome://branding/" assets. Otherwise web pages could easily and
+ // consistently detect the differences between channels when their
+ // branding differs. See tor-browser#43308 and tor-browser#42319.
+ // NOTE: The same assets under the alternative URI
+ // "resource:///chrome/browser/content/branding/" should already be
+ // inaccessible to web content, so we only add a condition for the chrome
+ // path.
+ if (targetScheme.EqualsLiteral("chrome")) {
+ nsAutoCString targetHost;
+ rv = aTargetBaseURI->GetHost(targetHost);
+ NS_ENSURE_SUCCESS(rv, rv);
+ if (targetHost.EqualsLiteral("branding")) {
+ // Disallow any Principal whose scheme is not "about", or is a
+ // contentaccessible "about" URI ("about:blank" or "about:srcdoc").
+ // NOTE: "about:blank" and "about:srcdoc" would be unexpected here
+ // since such a document spawned by a web document should inherit the
+ // same Principal URI. I.e. they would be "http:" or "https:" schemes.
+ // But we add this condition for extra assurances.
+ // NOTE: Documents with null Principals, like "about:blank" typed by
+ // the user, would also be excluded since the Principal URI would be
+ // "moz-nullprincipal:".
+ if (!aSourceBaseURI->SchemeIs("about") ||
+ NS_IsContentAccessibleAboutURI(aSourceBaseURI)) {
+ return NS_ERROR_DOM_BAD_URI;
+ }
+ // Also exclude "about:reader" from accessing branding assets. I.e. if
+ // a web page includes `<img src="chrome://branding/..." />` we do not
+ // want it to render within "about:reader" either.
+ // Though it is unknown whether the information within "about:reader"
+ // would be exploitable by a web page, we also want to exclude
+ // "about:reader" for consistency: if it does not display in the
+ // original web page, it should not display in "about:reader" either.
+ nsAutoCString sourcePath;
+ rv = aSourceBaseURI->GetFilePath(sourcePath);
+ NS_ENSURE_SUCCESS(rv, rv);
+ if (sourcePath.EqualsLiteral("reader")) {
+ return NS_ERROR_DOM_BAD_URI;
+ }
+ }
+ }
+
if (targetScheme.EqualsLiteral("resource")) {
if (StaticPrefs::security_all_resource_uri_content_accessible()) {
return NS_OK;
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/911…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/911…
You're receiving this email because of your account on gitlab.torproject.org.
ma1 pushed to branch base-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
41490079 by Henry Wilkes at 2025-02-03T17:56:16+01:00
BB 29745: Limit remote access to content accessible resources
- - - - -
1 changed file:
- caps/nsScriptSecurityManager.cpp
Changes:
=====================================
caps/nsScriptSecurityManager.cpp
=====================================
@@ -1044,6 +1044,48 @@ nsresult nsScriptSecurityManager::CheckLoadURIFlags(
}
}
+ // Only allow some "about:" pages to have access to contentaccessible
+ // "chrome://branding/" assets. Otherwise web pages could easily and
+ // consistently detect the differences between channels when their
+ // branding differs. See tor-browser#43308 and tor-browser#42319.
+ // NOTE: The same assets under the alternative URI
+ // "resource:///chrome/browser/content/branding/" should already be
+ // inaccessible to web content, so we only add a condition for the chrome
+ // path.
+ if (targetScheme.EqualsLiteral("chrome")) {
+ nsAutoCString targetHost;
+ rv = aTargetBaseURI->GetHost(targetHost);
+ NS_ENSURE_SUCCESS(rv, rv);
+ if (targetHost.EqualsLiteral("branding")) {
+ // Disallow any Principal whose scheme is not "about", or is a
+ // contentaccessible "about" URI ("about:blank" or "about:srcdoc").
+ // NOTE: "about:blank" and "about:srcdoc" would be unexpected here
+ // since such a document spawned by a web document should inherit the
+ // same Principal URI. I.e. they would be "http:" or "https:" schemes.
+ // But we add this condition for extra assurances.
+ // NOTE: Documents with null Principals, like "about:blank" typed by
+ // the user, would also be excluded since the Principal URI would be
+ // "moz-nullprincipal:".
+ if (!aSourceBaseURI->SchemeIs("about") ||
+ NS_IsContentAccessibleAboutURI(aSourceBaseURI)) {
+ return NS_ERROR_DOM_BAD_URI;
+ }
+ // Also exclude "about:reader" from accessing branding assets. I.e. if
+ // a web page includes `<img src="chrome://branding/..." />` we do not
+ // want it to render within "about:reader" either.
+ // Though it is unknown whether the information within "about:reader"
+ // would be exploitable by a web page, we also want to exclude
+ // "about:reader" for consistency: if it does not display in the
+ // original web page, it should not display in "about:reader" either.
+ nsAutoCString sourcePath;
+ rv = aSourceBaseURI->GetFilePath(sourcePath);
+ NS_ENSURE_SUCCESS(rv, rv);
+ if (sourcePath.EqualsLiteral("reader")) {
+ return NS_ERROR_DOM_BAD_URI;
+ }
+ }
+ }
+
if (targetScheme.EqualsLiteral("resource")) {
if (StaticPrefs::security_all_resource_uri_content_accessible()) {
return NS_OK;
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4149007…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4149007…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch mullvad-browser-128.7.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser
Commits:
8b25ea05 by Beatriz Rizental at 2025-02-03T16:00:38+01:00
fixup! Add CI for Base Browser
- - - - -
1 changed file:
- .gitlab/ci/mixins.yml
Changes:
=====================================
.gitlab/ci/mixins.yml
=====================================
@@ -4,7 +4,21 @@
before_script:
- git init
- git remote add local "$LOCAL_REPO_PATH"
- - git fetch --depth 500 local
+ - |
+ # Determine the reference of the target branch in the local repository copy.
+ #
+ # 1. List all references in the local repository
+ # 2. Filter the references to the target branch
+ # 3. Remove tags
+ # 4. Keep a single line, in case there are too many matches
+ # 5. Clean up the output
+ # 6. Remove everything before the last two slashes, because the output is like `refs/heads/...` or `refs/remotes/...`
+ TARGET_BRANCH=$(git ls-remote local | grep ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME} | grep -v 'refs/tags/' | awk '{print $2}' | tail -1 | sed 's|[^/]*/[^/]*/||')
+ if [ -z "$TARGET_BRANCH" ]; then
+ echo "Target branch $TARGET_BRANCH is not yet in local repository. Stopping the pipeline."
+ exit 1
+ fi
+ - git fetch --depth 500 local $TARGET_BRANCH
- git remote add origin "$CI_REPOSITORY_URL"
- |
if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then
@@ -26,7 +40,16 @@
before_script:
- git init
- git remote add local $env:LOCAL_REPO_PATH
- - git fetch --depth 500 local
+ - |
+ $branchName = $env:CI_COMMIT_BRANCH
+ if ([string]::IsNullOrEmpty($branchName)) {
+ $branchName = $env:CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+ }
+ $TARGET_BRANCH = git ls-remote local | Select-String -Pattern $branchName | Select-String -Pattern -NotMatch 'refs/tags/' | Select-Object -Last 1 | ForEach-Object { $_.ToString().Split()[1] -replace '^[^/]*/[^/]*/', '' }
+ if ([string]::IsNullOrEmpty($TARGET_BRANCH)) {
+ Write-Output "Target branch $TARGET_BRANCH is not yet in local repository. Stopping the pipeline."
+ exit 1
+ }
- git remote add origin $env:CI_REPOSITORY_URL
- |
$branchName = $env:CI_COMMIT_BRANCH
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/8b2…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/8b2…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch base-browser-128.7.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
2db79da2 by Beatriz Rizental at 2025-02-03T16:00:19+01:00
fixup! Add CI for Base Browser
- - - - -
1 changed file:
- .gitlab/ci/mixins.yml
Changes:
=====================================
.gitlab/ci/mixins.yml
=====================================
@@ -4,7 +4,21 @@
before_script:
- git init
- git remote add local "$LOCAL_REPO_PATH"
- - git fetch --depth 500 local
+ - |
+ # Determine the reference of the target branch in the local repository copy.
+ #
+ # 1. List all references in the local repository
+ # 2. Filter the references to the target branch
+ # 3. Remove tags
+ # 4. Keep a single line, in case there are too many matches
+ # 5. Clean up the output
+ # 6. Remove everything before the last two slashes, because the output is like `refs/heads/...` or `refs/remotes/...`
+ TARGET_BRANCH=$(git ls-remote local | grep ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME} | grep -v 'refs/tags/' | awk '{print $2}' | tail -1 | sed 's|[^/]*/[^/]*/||')
+ if [ -z "$TARGET_BRANCH" ]; then
+ echo "Target branch $TARGET_BRANCH is not yet in local repository. Stopping the pipeline."
+ exit 1
+ fi
+ - git fetch --depth 500 local $TARGET_BRANCH
- git remote add origin "$CI_REPOSITORY_URL"
- |
if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then
@@ -26,7 +40,16 @@
before_script:
- git init
- git remote add local $env:LOCAL_REPO_PATH
- - git fetch --depth 500 local
+ - |
+ $branchName = $env:CI_COMMIT_BRANCH
+ if ([string]::IsNullOrEmpty($branchName)) {
+ $branchName = $env:CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+ }
+ $TARGET_BRANCH = git ls-remote local | Select-String -Pattern $branchName | Select-String -Pattern -NotMatch 'refs/tags/' | Select-Object -Last 1 | ForEach-Object { $_.ToString().Split()[1] -replace '^[^/]*/[^/]*/', '' }
+ if ([string]::IsNullOrEmpty($TARGET_BRANCH)) {
+ Write-Output "Target branch $TARGET_BRANCH is not yet in local repository. Stopping the pipeline."
+ exit 1
+ }
- git remote add origin $env:CI_REPOSITORY_URL
- |
$branchName = $env:CI_COMMIT_BRANCH
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2db79da…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2db79da…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch tor-browser-128.7.0esr-14.0-1 at The Tor Project / Applications / Tor Browser
Commits:
8004ee08 by Beatriz Rizental at 2025-02-03T15:42:55+01:00
fixup! Add CI for Base Browser
- - - - -
1 changed file:
- .gitlab/ci/mixins.yml
Changes:
=====================================
.gitlab/ci/mixins.yml
=====================================
@@ -4,7 +4,21 @@
before_script:
- git init
- git remote add local "$LOCAL_REPO_PATH"
- - git fetch --depth 500 local
+ - |
+ # Determine the reference of the target branch in the local repository copy.
+ #
+ # 1. List all references in the local repository
+ # 2. Filter the references to the target branch
+ # 3. Remove tags
+ # 4. Keep a single line, in case there are too many matches
+ # 5. Clean up the output
+ # 6. Remove everything before the last two slashes, because the output is like `refs/heads/...` or `refs/remotes/...`
+ TARGET_BRANCH=$(git ls-remote local | grep ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME} | grep -v 'refs/tags/' | awk '{print $2}' | tail -1 | sed 's|[^/]*/[^/]*/||')
+ if [ -z "$TARGET_BRANCH" ]; then
+ echo "Target branch $TARGET_BRANCH is not yet in local repository. Stopping the pipeline."
+ exit 1
+ fi
+ - git fetch --depth 500 local $TARGET_BRANCH
- git remote add origin "$CI_REPOSITORY_URL"
- |
if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then
@@ -26,7 +40,16 @@
before_script:
- git init
- git remote add local $env:LOCAL_REPO_PATH
- - git fetch --depth 500 local
+ - |
+ $branchName = $env:CI_COMMIT_BRANCH
+ if ([string]::IsNullOrEmpty($branchName)) {
+ $branchName = $env:CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+ }
+ $TARGET_BRANCH = git ls-remote local | Select-String -Pattern $branchName | Select-String -Pattern -NotMatch 'refs/tags/' | Select-Object -Last 1 | ForEach-Object { $_.ToString().Split()[1] -replace '^[^/]*/[^/]*/', '' }
+ if ([string]::IsNullOrEmpty($TARGET_BRANCH)) {
+ Write-Output "Target branch $TARGET_BRANCH is not yet in local repository. Stopping the pipeline."
+ exit 1
+ }
- git remote add origin $env:CI_REPOSITORY_URL
- |
$branchName = $env:CI_COMMIT_BRANCH
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8004ee0…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8004ee0…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch base-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
4da10a5e by Beatriz Rizental at 2025-02-03T15:36:36+01:00
fixup! Add CI for Base Browser
- - - - -
1 changed file:
- .gitlab/ci/mixins.yml
Changes:
=====================================
.gitlab/ci/mixins.yml
=====================================
@@ -4,7 +4,21 @@
before_script:
- git init
- git remote add local "$LOCAL_REPO_PATH"
- - git fetch --depth 500 local ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME}
+ - |
+ # Determine the reference of the target branch in the local repository copy.
+ #
+ # 1. List all references in the local repository
+ # 2. Filter the references to the target branch
+ # 3. Remove tags
+ # 4. Keep a single line, in case there are too many matches
+ # 5. Clean up the output
+ # 6. Remove everything before the last two slashes, because the output is like `refs/heads/...` or `refs/remotes/...`
+ TARGET_BRANCH=$(git ls-remote local | grep ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME} | grep -v 'refs/tags/' | awk '{print $2}' | tail -1 | sed 's|[^/]*/[^/]*/||')
+ if [ -z "$TARGET_BRANCH" ]; then
+ echo "Target branch $TARGET_BRANCH is not yet in local repository. Stopping the pipeline."
+ exit 1
+ fi
+ - git fetch --depth 500 local $TARGET_BRANCH
- git remote add origin "$CI_REPOSITORY_URL"
- |
if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then
@@ -31,7 +45,11 @@
if ([string]::IsNullOrEmpty($branchName)) {
$branchName = $env:CI_MERGE_REQUEST_TARGET_BRANCH_NAME
}
- git fetch --depth 500 local $branchName
+ $TARGET_BRANCH = git ls-remote local | Select-String -Pattern $branchName | Select-String -Pattern -NotMatch 'refs/tags/' | Select-Object -Last 1 | ForEach-Object { $_.ToString().Split()[1] -replace '^[^/]*/[^/]*/', '' }
+ if ([string]::IsNullOrEmpty($TARGET_BRANCH)) {
+ Write-Output "Target branch $TARGET_BRANCH is not yet in local repository. Stopping the pipeline."
+ exit 1
+ }
- git remote add origin $env:CI_REPOSITORY_URL
- |
$branchName = $env:CI_COMMIT_BRANCH
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4da10a5…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4da10a5…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch mullvad-browser-128.7.0esr-14.5-1 at The Tor Project / Applications / Mullvad Browser
Commits:
40c8eec9 by Beatriz Rizental at 2025-02-03T15:36:14+01:00
fixup! Add CI for Base Browser
- - - - -
1 changed file:
- .gitlab/ci/mixins.yml
Changes:
=====================================
.gitlab/ci/mixins.yml
=====================================
@@ -4,7 +4,21 @@
before_script:
- git init
- git remote add local "$LOCAL_REPO_PATH"
- - git fetch --depth 500 local ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME}
+ - |
+ # Determine the reference of the target branch in the local repository copy.
+ #
+ # 1. List all references in the local repository
+ # 2. Filter the references to the target branch
+ # 3. Remove tags
+ # 4. Keep a single line, in case there are too many matches
+ # 5. Clean up the output
+ # 6. Remove everything before the last two slashes, because the output is like `refs/heads/...` or `refs/remotes/...`
+ TARGET_BRANCH=$(git ls-remote local | grep ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_TARGET_BRANCH_NAME} | grep -v 'refs/tags/' | awk '{print $2}' | tail -1 | sed 's|[^/]*/[^/]*/||')
+ if [ -z "$TARGET_BRANCH" ]; then
+ echo "Target branch $TARGET_BRANCH is not yet in local repository. Stopping the pipeline."
+ exit 1
+ fi
+ - git fetch --depth 500 local $TARGET_BRANCH
- git remote add origin "$CI_REPOSITORY_URL"
- |
if [ -z "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" ]; then
@@ -31,7 +45,11 @@
if ([string]::IsNullOrEmpty($branchName)) {
$branchName = $env:CI_MERGE_REQUEST_TARGET_BRANCH_NAME
}
- git fetch --depth 500 local $branchName
+ $TARGET_BRANCH = git ls-remote local | Select-String -Pattern $branchName | Select-String -Pattern -NotMatch 'refs/tags/' | Select-Object -Last 1 | ForEach-Object { $_.ToString().Split()[1] -replace '^[^/]*/[^/]*/', '' }
+ if ([string]::IsNullOrEmpty($TARGET_BRANCH)) {
+ Write-Output "Target branch $TARGET_BRANCH is not yet in local repository. Stopping the pipeline."
+ exit 1
+ }
- git remote add origin $env:CI_REPOSITORY_URL
- |
$branchName = $env:CI_COMMIT_BRANCH
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/40c…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/40c…
You're receiving this email because of your account on gitlab.torproject.org.