- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][base-browser-128.1.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 12 Aug '24

12 Aug '24

morgan pushed to branch base-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 35055e24 by Pier Angelo Vendrame at 2024-08-12T17:36:22+00:00 fixup! Firefox preference overrides. Bug 42814: Opt out from Firefox relay by default. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -320,6 +320,10 @@ pref("security.pki.crlite_mode", 0); // Disable website password breach alerts pref("signon.management.page.breach-alerts.enabled", false); +// tor-browser#42814: Opt out from Firefox relay by default. +// Firefox would normally assign disabled when a user has been presented the +// opportunity to use the service and opted out (see firefox.js). +pref("signon.firefoxRelay.feature", "disabled"); // Disable remote "password recipes". They are a way to improve the UX of the // password manager by havinc specific heuristics for some sites. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/35055e2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/35055e2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 12 Aug '24

12 Aug '24

morgan pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: c83f41d4 by Pier Angelo Vendrame at 2024-08-12T17:27:11+00:00 fixup! Firefox preference overrides. Bug 42814: Opt out from Firefox relay by default. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -320,6 +320,10 @@ pref("security.pki.crlite_mode", 0); // Disable website password breach alerts pref("signon.management.page.breach-alerts.enabled", false); +// tor-browser#42814: Opt out from Firefox relay by default. +// Firefox would normally assign disabled when a user has been presented the +// opportunity to use the service and opted out (see firefox.js). +pref("signon.firefoxRelay.feature", "disabled"); // Disable remote "password recipes". They are a way to improve the UX of the // password manager by havinc specific heuristics for some sites. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c83f41d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c83f41d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by morgan (＠morgan) 12 Aug '24

12 Aug '24

morgan pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: b3ceb09d by Henry Wilkes at 2024-08-12T17:10:48+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42697: Remove inline-start padding from tor bridge provider list. - - - - - 1 changed file: - browser/components/torpreferences/content/torPreferences.css Changes: ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -724,6 +724,7 @@ button.spoof-button-disabled { /* 16px gap between items. */ gap: 16px 12px; margin-block: 16px; + padding: 0; } .tor-bridges-provider-item { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b3ceb09… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b3ceb09… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] fixup! Bug 40701: Add security warning when downloading a file
by morgan (＠morgan) 12 Aug '24

12 Aug '24

morgan pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 6ba5bd37 by Henry Wilkes at 2024-08-12T16:42:46+00:00 fixup! Bug 40701: Add security warning when downloading a file Bug 42643: Match margin for download warning separator. - - - - - 1 changed file: - browser/themes/shared/downloads/downloads.inc.css Changes: ===================================== browser/themes/shared/downloads/downloads.inc.css ===================================== @@ -252,7 +252,7 @@ } /*** Toolbarseparator ***/ -#downloadsWarning toolbarseparator, +#downloadsPanelTorWarning toolbarseparator, #downloadsFooterButtons > toolbarseparator { margin-inline: 0; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6ba5bd3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6ba5bd3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] 2 commits: fixup! Bug 40209: Implement Basic Crypto Safety
by morgan (＠morgan) 12 Aug '24

12 Aug '24

morgan pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 4023a7c6 by Pier Angelo Vendrame at 2024-08-12T16:20:28+00:00 fixup! Bug 40209: Implement Basic Crypto Safety Bug 43001: Ship only a copy of the MIT license, like upstream. See MozBug 1838373. - - - - - b962fd9c by Pier Angelo Vendrame at 2024-08-12T16:20:28+00:00 fixup! Bug 40807: Added QRCode.js to toolkit/modules Bug 43001: Ship only a copy of the MIT license, like upstream. See MozBug 1838373. - - - - - 1 changed file: - toolkit/content/license.html Changes: ===================================== toolkit/content/license.html ===================================== @@ -67,7 +67,6 @@ <li><a href="about:license#apple">Apple License</a></li> <li><a href="about:license#apple-password-rules-parser">Apple Password Rules Parser License</a></li> <li><a href="about:license#arm">ARM License</a></li> - <li><a href="about:license#bech32">Bech32 License</a></li> <li><a href="about:license#boost">boost License</a></li> <li><a href="about:license#bsd2clause">BSD 2-Clause License</a></li> <li><a href="about:license#bsd3clause">BSD 3-Clause License</a></li> @@ -134,7 +133,6 @@ <li><a href="about:license#praton1">praton and inet_ntop License</a></li> <li><a href="about:license#qcms">qcms License</a></li> <li><a href="about:license#qrcode-generator">QR Code Generator License</a></li> - <li><a href="about:license#qrcode-js">QRCode.js License</a></li> <li><a href="about:license#react">React License</a></li> <li><a href="about:license#react-redux">React-Redux License</a></li> <li><a href="about:license#xdg">Red Hat xdg_user_dir_lookup License</a></li> @@ -1818,38 +1816,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. </pre> - - <hr> - - <h1><a id="bech32"></a>Bech32 License</h1> - - <p>This license applies to the file - <code>toolkit/modules/Bech32Decode.sys.mjs</code>. - </p> - -<pre> -Copyright (c) 2017 Pieter Wuille - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -</pre> - - <hr> <h1><a id="boost"></a>boost License</h1> @@ -3664,6 +3630,8 @@ SOFTWARE. <li><code>js/src/vm/Float16.h</code>(the code contained in the half namespace)</li> <li><code>toolkit/components/resistfingerprinting/content/gl-matrix.js</code></li> <li><code>toolkit/components/resistfingerprinting/content/ssdeep.js</code></li> + <li><code>toolkit/modules/Bech32Decode.sys.mjs</code></li> + <li><code>toolkit/modules/QRCode.sys.mjs</code></li> </ul> See the individual LICENSE files or headers for copyright owners.</p> @@ -4249,38 +4217,6 @@ furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. -</pre> - - <hr> - - <h1><a id="qrcode-js"></a>QRCode.js License</h1> - - <p>This license applies to the file - <code>toolkit/modules/QRCode.sys.mjs</code>.</p> -<pre> -The MIT License (MIT) ---------------------- -Copyright (c) 2009 Kazuhiko Arase -Copyright (c) 2012 davidshimjs -Copyright (c) 2018 ivan386 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f4d44b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f4d44b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.1.0esr-14.0-1] fixup! Add CI for Base Browser
by Pier Angelo Vendrame (＠pierov) 12 Aug '24

12 Aug '24

Pier Angelo Vendrame pushed to branch base-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 8f26cea2 by Beatriz Rizental at 2024-08-12T16:32:16+02:00 fixup! Add CI for Base Browser Bug 42997: Reduce the number of git fetches by fetching during a setup job and passing that initial fetch around as a git bundle to other jobs through the Gitlab artifacts. Further reduce the number of fetches by creating a list of changed files in the setup job and passing that around as well as an artifact. - - - - - 4 changed files: - .gitlab-ci.yml - .gitlab/ci/lint.yml - .gitlab/ci/scripts/run_linters.py → .gitlab/ci/scripts/helpers.py - + .gitlab/ci/setup.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,8 +1,10 @@ stages: + - setup - lint variables: IMAGE_PATH: containers.torproject.org/tpo/applications/tor-browser/base:latest include: + - local: '.gitlab/ci/setup.yml' - local: '.gitlab/ci/lint.yml' ===================================== .gitlab/ci/lint.yml ===================================== @@ -1,8 +1,15 @@ .base: stage: lint + image: $IMAGE_PATH interruptible: true + needs: + - job: setup-env + artifacts: true + - job: create-bundle + artifacts: true variables: MOZBUILD_STATE_PATH: "$CI_PROJECT_DIR/.cache/mozbuild" + GIT_STRATEGY: "none" cache: paths: - node_modules @@ -11,12 +18,26 @@ when: 'always' # Share the cache throughout all pipelines running for a given branch key: $CI_COMMIT_REF_SLUG + before_script: + # DEBUG: Are all artifacts here? + - ls -a + - mkdir app && cd app + # Initialize a fresh git repo + - git init + # Add app.bundle as the remote. All operations that communicate with the remote will be local. + - git remote add origin ../app.bundle + # shallow.txt contains the SHA of the base commit of the bundle. + # The bundle is shallow, therefore it's base commit will not have a parent. + # Adding the SHA of the base commit to .git/shallow tells git that it doesn't need + # to crash when it realizes said base commit doesn't have a parent. + - cp ../shallow.txt .git/shallow + # Finally, unpack the bundle. Time it for debugging purposes. + - time git pull origin $BRANCH_NAME eslint: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py eslint + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l eslint rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -44,9 +65,8 @@ eslint: stylelint: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py stylelint + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l stylelint rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -63,9 +83,8 @@ stylelint: py-black: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py black + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l black rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -83,9 +102,8 @@ py-black: py-ruff: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py ruff + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l ruff rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -103,9 +121,8 @@ py-ruff: yaml: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py yaml + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l yaml rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -119,9 +136,8 @@ yaml: shellcheck: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py shellcheck + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l shellcheck rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -134,10 +150,9 @@ shellcheck: clang-format: extends: .base - image: $IMAGE_PATH script: - ./mach configure --without-wasm-sandboxed-libraries --with-base-browser-version=0.0.0 - - .gitlab/ci/scripts/run_linters.py clang-format + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l clang-format rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -155,9 +170,8 @@ clang-format: rustfmt: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py rustfmt + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l rustfmt rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -170,9 +184,8 @@ rustfmt: fluent-lint: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py fluent-lint + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l fluent-lint rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -186,9 +199,8 @@ fluent-lint: localization: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py l10n + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l l10n rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -204,9 +216,8 @@ localization: mingw-capitalization: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py mingw-capitalization + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l mingw-capitalization rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -222,9 +233,8 @@ mingw-capitalization: mscom-init: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py mscom-init + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l mscom-init rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -240,9 +250,8 @@ mscom-init: file-whitespace: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py file-whitespace + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l file-whitespace rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -270,9 +279,8 @@ file-whitespace: test-manifest: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py test-manifest-alpha test-manifest-disable test-manifest-skip-if + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l test-manifest-alpha -l test-manifest-disable -l test-manifest-skip-if rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -286,9 +294,8 @@ test-manifest: trojan-source: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py trojan-source + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l trojan-source rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: ===================================== .gitlab/ci/scripts/run_linters.py → .gitlab/ci/scripts/helpers.py ===================================== @@ -5,7 +5,6 @@ import os import re import shlex import subprocess -import sys def git(command): @@ -15,8 +14,8 @@ def git(command): return result.stdout.strip() -def get_firefox_tag_from_branch_name(branch_name): - """Extracts the Firefox tag associated with a branch name. +def get_firefox_tag(reference): + """Extracts the Firefox tag associated with a branch or tag name. The "firefox tag" is the tag that marks the end of the Mozilla commits and the start of the Tor Project commits. @@ -25,26 +24,26 @@ def get_firefox_tag_from_branch_name(branch_name): this function may return the incorrect reference number. Args: - branch_name: The branch name to extract the tag from. + reference: The branch or tag name to extract the Firefox tag from. Expected format is tor-browser-91.2.0esr-11.0-1, where 91.2.0esr is the Firefox version. Returns: The reference specifier of the matching Firefox tag. - An exception wil be raised if anything goes wrong. + An exception will be raised if anything goes wrong. """ - # Extracts the version number from a branch name. + # Extracts the version number from a branch or tag name. firefox_version = "" - match = re.search(r"(?<=browser-)([^-]+)", branch_name) + match = re.search(r"(?<=browser-)([^-]+)", reference) if match: # TODO: Validate that what we got is actually a valid semver string? firefox_version = match.group(1) else: - raise ValueError(f"Failed to extract version from branch name '{branch_name}'.") + raise ValueError(f"Failed to extract version from reference '{reference}'.") tag = f"FIREFOX_{firefox_version.replace('.', '_')}_" - remote_tags = git("ls-remote --tags") + remote_tags = git("ls-remote --tags origin") # Each line looks like: # 9edd658bfd03a6b4743ecb75fd4a9ad968603715 refs/tags/FIREFOX_91_9_0esr_BUILD1 @@ -54,7 +53,7 @@ def get_firefox_tag_from_branch_name(branch_name): return match.group(0).split()[0] else: raise ValueError( - f"Failed to find reference specifier for Firefox tag '{tag}' in branch '{branch_name}'." + f"Failed to find reference specifier for Firefox tag '{tag}' from '{reference}'." ) @@ -74,37 +73,42 @@ def get_list_of_changed_files(): base_reference = "" if os.getenv("CI_PIPELINE_SOURCE") == "merge_request_event": - # For merge requests, the base_reference is the common ancestor between the MR and the target branch. + # For merge requests, the base_reference is the common ancestor between the MR and the target branch base_reference = os.getenv("CI_MERGE_REQUEST_DIFF_BASE_SHA") else: # When not in merge requests, the base reference is the Firefox tag - base_reference = get_firefox_tag_from_branch_name(os.getenv("CI_COMMIT_BRANCH")) + base_reference = get_firefox_tag(os.getenv("CI_COMMIT_BRANCH")) if not base_reference: raise RuntimeError("No base reference found. There might be more errors above.") # Fetch the tag reference git(f"fetch origin {base_reference} --depth=1 --filter=blob:none") - # Return the list of changed files - return git(f"diff --diff-filter=d --name-only {base_reference} HEAD").split("\n") + # Return but filter the issue_templates files because those file names have spaces which can cause issues + return git("diff --diff-filter=d --name-only FETCH_HEAD HEAD").split("\n") if __name__ == "__main__": - parser = argparse.ArgumentParser( - description="Run ./mach linters in CI. Warning: if you run this in your local environment it might mess up your git history." + parser = argparse.ArgumentParser(description="") + + parser.add_argument( + "--get-firefox-tag", + help="Get the Firefox tag related to a given (tor-mullvad-base)-browser tag or branch name.", + type=str, ) parser.add_argument( - "linters", metavar="L", type=str, nargs="+", help="A list of linters to run." + "--get-changed-files", + help="Get list of changed files." + "When running from a merge request get sthe list of changed files since the merge-base of the current branch." + "When running from a protected branch i.e. any branch that starts with <something>-browser-, gets the list of files changed since the FIREFOX_ tag.", + action="store_true", ) + args = parser.parse_args() - changed_files = get_list_of_changed_files() - if changed_files: - command = ["./mach", "lint", "-v"] - for linter in args.linters: - command.extend(["-l", linter]) - command.extend(changed_files) - result = subprocess.run(command, text=True) - sys.exit(result.returncode) + if args.get_firefox_tag: + print(get_firefox_tag(args.get_firefox_tag)) + elif args.get_changed_files: + print("\n".join(get_list_of_changed_files())) else: - print("No files changed, skipping linting.") + print("No valid option provided.") ===================================== .gitlab/ci/setup.yml ===================================== @@ -0,0 +1,53 @@ +setup-env: + stage: setup + interruptible: true + variables: + GIT_STRATEGY: "none" + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_REF_PROTECTED == 'true' + script: + - | + if [ -n "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ]; then + echo "BRANCH_NAME=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" > build.env + else + echo "BRANCH_NAME=$CI_COMMIT_REF_NAME" > build.env + fi + artifacts: + reports: + dotenv: + - build.env + +create-bundle: + stage: setup + # TODO: Find a better suited image, this one just has git. + image: python + needs: + - job: setup-env + artifacts: true + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_REF_PROTECTED == 'true' + variables: + GIT_DEPTH: "1" + interruptible: true + script: + # DEBUG: Check repository status. + - git status + # Switch to a named branch. + - git switch -c $BRANCH_NAME + # Create a git bundle -- this will generate the app.bundle file, + # which can be used as a git remote for offline fetching. + - git bundle create app.bundle --all + # Retain the SHA of the base of this shallow repository. + - cat .git/shallow > shallow.txt + # DEBUG: Check sizes. + - du -sh .git + - du -sh app.bundle + # Since this is the only job we have access to the Gitlab remote, + # let's get a list of changed files to use in the next jobs. + - .gitlab/ci/scripts/helpers.py --get-changed-files > changedfiles.txt + artifacts: + paths: + - app.bundle + - shallow.txt + - changedfiles.txt + expire_in: 1 hour View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8f26cea… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8f26cea… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.1.0esr-14.0-1] fixup! Add CI for Base Browser
by Pier Angelo Vendrame (＠pierov) 12 Aug '24

12 Aug '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 7c7be722 by Beatriz Rizental at 2024-08-12T16:31:55+02:00 fixup! Add CI for Base Browser Bug 42997: Reduce the number of git fetches by fetching during a setup job and passing that initial fetch around as a git bundle to other jobs through the Gitlab artifacts. Further reduce the number of fetches by creating a list of changed files in the setup job and passing that around as well as an artifact. - - - - - 4 changed files: - .gitlab-ci.yml - .gitlab/ci/lint.yml - .gitlab/ci/scripts/run_linters.py → .gitlab/ci/scripts/helpers.py - + .gitlab/ci/setup.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,8 +1,10 @@ stages: + - setup - lint variables: IMAGE_PATH: containers.torproject.org/tpo/applications/tor-browser/base:latest include: + - local: '.gitlab/ci/setup.yml' - local: '.gitlab/ci/lint.yml' ===================================== .gitlab/ci/lint.yml ===================================== @@ -1,8 +1,15 @@ .base: stage: lint + image: $IMAGE_PATH interruptible: true + needs: + - job: setup-env + artifacts: true + - job: create-bundle + artifacts: true variables: MOZBUILD_STATE_PATH: "$CI_PROJECT_DIR/.cache/mozbuild" + GIT_STRATEGY: "none" cache: paths: - node_modules @@ -11,12 +18,26 @@ when: 'always' # Share the cache throughout all pipelines running for a given branch key: $CI_COMMIT_REF_SLUG + before_script: + # DEBUG: Are all artifacts here? + - ls -a + - mkdir app && cd app + # Initialize a fresh git repo + - git init + # Add app.bundle as the remote. All operations that communicate with the remote will be local. + - git remote add origin ../app.bundle + # shallow.txt contains the SHA of the base commit of the bundle. + # The bundle is shallow, therefore it's base commit will not have a parent. + # Adding the SHA of the base commit to .git/shallow tells git that it doesn't need + # to crash when it realizes said base commit doesn't have a parent. + - cp ../shallow.txt .git/shallow + # Finally, unpack the bundle. Time it for debugging purposes. + - time git pull origin $BRANCH_NAME eslint: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py eslint + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l eslint rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -44,9 +65,8 @@ eslint: stylelint: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py stylelint + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l stylelint rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -63,9 +83,8 @@ stylelint: py-black: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py black + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l black rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -83,9 +102,8 @@ py-black: py-ruff: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py ruff + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l ruff rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -103,9 +121,8 @@ py-ruff: yaml: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py yaml + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l yaml rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -119,9 +136,8 @@ yaml: shellcheck: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py shellcheck + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l shellcheck rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -134,10 +150,9 @@ shellcheck: clang-format: extends: .base - image: $IMAGE_PATH script: - ./mach configure --without-wasm-sandboxed-libraries --with-base-browser-version=0.0.0 - - .gitlab/ci/scripts/run_linters.py clang-format + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l clang-format rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -155,9 +170,8 @@ clang-format: rustfmt: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py rustfmt + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l rustfmt rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -170,9 +184,8 @@ rustfmt: fluent-lint: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py fluent-lint + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l fluent-lint rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -186,9 +199,8 @@ fluent-lint: localization: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py l10n + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l l10n rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -204,9 +216,8 @@ localization: mingw-capitalization: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py mingw-capitalization + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l mingw-capitalization rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -222,9 +233,8 @@ mingw-capitalization: mscom-init: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py mscom-init + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l mscom-init rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -240,9 +250,8 @@ mscom-init: file-whitespace: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py file-whitespace + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l file-whitespace rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -270,9 +279,8 @@ file-whitespace: test-manifest: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py test-manifest-alpha test-manifest-disable test-manifest-skip-if + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l test-manifest-alpha -l test-manifest-disable -l test-manifest-skip-if rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -286,9 +294,8 @@ test-manifest: trojan-source: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py trojan-source + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l trojan-source rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: ===================================== .gitlab/ci/scripts/run_linters.py → .gitlab/ci/scripts/helpers.py ===================================== @@ -5,7 +5,6 @@ import os import re import shlex import subprocess -import sys def git(command): @@ -15,8 +14,8 @@ def git(command): return result.stdout.strip() -def get_firefox_tag_from_branch_name(branch_name): - """Extracts the Firefox tag associated with a branch name. +def get_firefox_tag(reference): + """Extracts the Firefox tag associated with a branch or tag name. The "firefox tag" is the tag that marks the end of the Mozilla commits and the start of the Tor Project commits. @@ -25,26 +24,26 @@ def get_firefox_tag_from_branch_name(branch_name): this function may return the incorrect reference number. Args: - branch_name: The branch name to extract the tag from. + reference: The branch or tag name to extract the Firefox tag from. Expected format is tor-browser-91.2.0esr-11.0-1, where 91.2.0esr is the Firefox version. Returns: The reference specifier of the matching Firefox tag. - An exception wil be raised if anything goes wrong. + An exception will be raised if anything goes wrong. """ - # Extracts the version number from a branch name. + # Extracts the version number from a branch or tag name. firefox_version = "" - match = re.search(r"(?<=browser-)([^-]+)", branch_name) + match = re.search(r"(?<=browser-)([^-]+)", reference) if match: # TODO: Validate that what we got is actually a valid semver string? firefox_version = match.group(1) else: - raise ValueError(f"Failed to extract version from branch name '{branch_name}'.") + raise ValueError(f"Failed to extract version from reference '{reference}'.") tag = f"FIREFOX_{firefox_version.replace('.', '_')}_" - remote_tags = git("ls-remote --tags") + remote_tags = git("ls-remote --tags origin") # Each line looks like: # 9edd658bfd03a6b4743ecb75fd4a9ad968603715 refs/tags/FIREFOX_91_9_0esr_BUILD1 @@ -54,7 +53,7 @@ def get_firefox_tag_from_branch_name(branch_name): return match.group(0).split()[0] else: raise ValueError( - f"Failed to find reference specifier for Firefox tag '{tag}' in branch '{branch_name}'." + f"Failed to find reference specifier for Firefox tag '{tag}' from '{reference}'." ) @@ -74,37 +73,42 @@ def get_list_of_changed_files(): base_reference = "" if os.getenv("CI_PIPELINE_SOURCE") == "merge_request_event": - # For merge requests, the base_reference is the common ancestor between the MR and the target branch. + # For merge requests, the base_reference is the common ancestor between the MR and the target branch base_reference = os.getenv("CI_MERGE_REQUEST_DIFF_BASE_SHA") else: # When not in merge requests, the base reference is the Firefox tag - base_reference = get_firefox_tag_from_branch_name(os.getenv("CI_COMMIT_BRANCH")) + base_reference = get_firefox_tag(os.getenv("CI_COMMIT_BRANCH")) if not base_reference: raise RuntimeError("No base reference found. There might be more errors above.") # Fetch the tag reference git(f"fetch origin {base_reference} --depth=1 --filter=blob:none") - # Return the list of changed files - return git(f"diff --diff-filter=d --name-only {base_reference} HEAD").split("\n") + # Return but filter the issue_templates files because those file names have spaces which can cause issues + return git("diff --diff-filter=d --name-only FETCH_HEAD HEAD").split("\n") if __name__ == "__main__": - parser = argparse.ArgumentParser( - description="Run ./mach linters in CI. Warning: if you run this in your local environment it might mess up your git history." + parser = argparse.ArgumentParser(description="") + + parser.add_argument( + "--get-firefox-tag", + help="Get the Firefox tag related to a given (tor-mullvad-base)-browser tag or branch name.", + type=str, ) parser.add_argument( - "linters", metavar="L", type=str, nargs="+", help="A list of linters to run." + "--get-changed-files", + help="Get list of changed files." + "When running from a merge request get sthe list of changed files since the merge-base of the current branch." + "When running from a protected branch i.e. any branch that starts with <something>-browser-, gets the list of files changed since the FIREFOX_ tag.", + action="store_true", ) + args = parser.parse_args() - changed_files = get_list_of_changed_files() - if changed_files: - command = ["./mach", "lint", "-v"] - for linter in args.linters: - command.extend(["-l", linter]) - command.extend(changed_files) - result = subprocess.run(command, text=True) - sys.exit(result.returncode) + if args.get_firefox_tag: + print(get_firefox_tag(args.get_firefox_tag)) + elif args.get_changed_files: + print("\n".join(get_list_of_changed_files())) else: - print("No files changed, skipping linting.") + print("No valid option provided.") ===================================== .gitlab/ci/setup.yml ===================================== @@ -0,0 +1,53 @@ +setup-env: + stage: setup + interruptible: true + variables: + GIT_STRATEGY: "none" + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_REF_PROTECTED == 'true' + script: + - | + if [ -n "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ]; then + echo "BRANCH_NAME=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" > build.env + else + echo "BRANCH_NAME=$CI_COMMIT_REF_NAME" > build.env + fi + artifacts: + reports: + dotenv: + - build.env + +create-bundle: + stage: setup + # TODO: Find a better suited image, this one just has git. + image: python + needs: + - job: setup-env + artifacts: true + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_REF_PROTECTED == 'true' + variables: + GIT_DEPTH: "1" + interruptible: true + script: + # DEBUG: Check repository status. + - git status + # Switch to a named branch. + - git switch -c $BRANCH_NAME + # Create a git bundle -- this will generate the app.bundle file, + # which can be used as a git remote for offline fetching. + - git bundle create app.bundle --all + # Retain the SHA of the base of this shallow repository. + - cat .git/shallow > shallow.txt + # DEBUG: Check sizes. + - du -sh .git + - du -sh app.bundle + # Since this is the only job we have access to the Gitlab remote, + # let's get a list of changed files to use in the next jobs. + - .gitlab/ci/scripts/helpers.py --get-changed-files > changedfiles.txt + artifacts: + paths: + - app.bundle + - shallow.txt + - changedfiles.txt + expire_in: 1 hour View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/7c7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/7c7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] fixup! Add CI for Base Browser
by Pier Angelo Vendrame (＠pierov) 12 Aug '24

12 Aug '24

Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: f4d44bf6 by Beatriz Rizental at 2024-08-12T14:25:08+00:00 fixup! Add CI for Base Browser Bug 42997: Reduce the number of git fetches by fetching during a setup job and passing that initial fetch around as a git bundle to other jobs through the Gitlab artifacts. Further reduce the number of fetches by creating a list of changed files in the setup job and passing that around as well as an artifact. - - - - - 4 changed files: - .gitlab-ci.yml - .gitlab/ci/lint.yml - .gitlab/ci/scripts/run_linters.py → .gitlab/ci/scripts/helpers.py - + .gitlab/ci/setup.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,4 +1,5 @@ stages: + - setup - lint - update-translations @@ -6,5 +7,6 @@ variables: IMAGE_PATH: containers.torproject.org/tpo/applications/tor-browser/base:latest include: + - local: '.gitlab/ci/setup.yml' - local: '.gitlab/ci/lint.yml' - local: '.gitlab/ci/update-translations.yml' ===================================== .gitlab/ci/lint.yml ===================================== @@ -1,8 +1,15 @@ .base: stage: lint + image: $IMAGE_PATH interruptible: true + needs: + - job: setup-env + artifacts: true + - job: create-bundle + artifacts: true variables: MOZBUILD_STATE_PATH: "$CI_PROJECT_DIR/.cache/mozbuild" + GIT_STRATEGY: "none" cache: paths: - node_modules @@ -11,12 +18,26 @@ when: 'always' # Share the cache throughout all pipelines running for a given branch key: $CI_COMMIT_REF_SLUG + before_script: + # DEBUG: Are all artifacts here? + - ls -a + - mkdir app && cd app + # Initialize a fresh git repo + - git init + # Add app.bundle as the remote. All operations that communicate with the remote will be local. + - git remote add origin ../app.bundle + # shallow.txt contains the SHA of the base commit of the bundle. + # The bundle is shallow, therefore it's base commit will not have a parent. + # Adding the SHA of the base commit to .git/shallow tells git that it doesn't need + # to crash when it realizes said base commit doesn't have a parent. + - cp ../shallow.txt .git/shallow + # Finally, unpack the bundle. Time it for debugging purposes. + - time git pull origin $BRANCH_NAME eslint: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py eslint + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l eslint rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -44,9 +65,8 @@ eslint: stylelint: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py stylelint + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l stylelint rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -63,9 +83,8 @@ stylelint: py-black: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py black + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l black rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -83,9 +102,8 @@ py-black: py-ruff: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py ruff + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l ruff rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -103,9 +121,8 @@ py-ruff: yaml: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py yaml + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l yaml rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -119,9 +136,8 @@ yaml: shellcheck: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py shellcheck + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l shellcheck rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -134,10 +150,9 @@ shellcheck: clang-format: extends: .base - image: $IMAGE_PATH script: - ./mach configure --without-wasm-sandboxed-libraries --with-base-browser-version=0.0.0 - - .gitlab/ci/scripts/run_linters.py clang-format + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l clang-format rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -155,9 +170,8 @@ clang-format: rustfmt: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py rustfmt + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l rustfmt rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -170,9 +184,8 @@ rustfmt: fluent-lint: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py fluent-lint + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l fluent-lint rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -186,9 +199,8 @@ fluent-lint: localization: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py l10n + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l l10n rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -204,9 +216,8 @@ localization: mingw-capitalization: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py mingw-capitalization + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l mingw-capitalization rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -222,9 +233,8 @@ mingw-capitalization: mscom-init: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py mscom-init + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l mscom-init rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -240,9 +250,8 @@ mscom-init: file-whitespace: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py file-whitespace + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l file-whitespace rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -270,9 +279,8 @@ file-whitespace: test-manifest: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py test-manifest-alpha test-manifest-disable test-manifest-skip-if + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l test-manifest-alpha -l test-manifest-disable -l test-manifest-skip-if rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: @@ -286,9 +294,8 @@ test-manifest: trojan-source: extends: .base - image: $IMAGE_PATH script: - - .gitlab/ci/scripts/run_linters.py trojan-source + - cat ../changedfiles.txt | xargs -d '\n' ./mach lint -l trojan-source rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' changes: ===================================== .gitlab/ci/scripts/run_linters.py → .gitlab/ci/scripts/helpers.py ===================================== @@ -5,7 +5,6 @@ import os import re import shlex import subprocess -import sys def git(command): @@ -15,8 +14,8 @@ def git(command): return result.stdout.strip() -def get_firefox_tag_from_branch_name(branch_name): - """Extracts the Firefox tag associated with a branch name. +def get_firefox_tag(reference): + """Extracts the Firefox tag associated with a branch or tag name. The "firefox tag" is the tag that marks the end of the Mozilla commits and the start of the Tor Project commits. @@ -25,26 +24,26 @@ def get_firefox_tag_from_branch_name(branch_name): this function may return the incorrect reference number. Args: - branch_name: The branch name to extract the tag from. + reference: The branch or tag name to extract the Firefox tag from. Expected format is tor-browser-91.2.0esr-11.0-1, where 91.2.0esr is the Firefox version. Returns: The reference specifier of the matching Firefox tag. - An exception wil be raised if anything goes wrong. + An exception will be raised if anything goes wrong. """ - # Extracts the version number from a branch name. + # Extracts the version number from a branch or tag name. firefox_version = "" - match = re.search(r"(?<=browser-)([^-]+)", branch_name) + match = re.search(r"(?<=browser-)([^-]+)", reference) if match: # TODO: Validate that what we got is actually a valid semver string? firefox_version = match.group(1) else: - raise ValueError(f"Failed to extract version from branch name '{branch_name}'.") + raise ValueError(f"Failed to extract version from reference '{reference}'.") tag = f"FIREFOX_{firefox_version.replace('.', '_')}_" - remote_tags = git("ls-remote --tags") + remote_tags = git("ls-remote --tags origin") # Each line looks like: # 9edd658bfd03a6b4743ecb75fd4a9ad968603715 refs/tags/FIREFOX_91_9_0esr_BUILD1 @@ -54,7 +53,7 @@ def get_firefox_tag_from_branch_name(branch_name): return match.group(0).split()[0] else: raise ValueError( - f"Failed to find reference specifier for Firefox tag '{tag}' in branch '{branch_name}'." + f"Failed to find reference specifier for Firefox tag '{tag}' from '{reference}'." ) @@ -74,37 +73,42 @@ def get_list_of_changed_files(): base_reference = "" if os.getenv("CI_PIPELINE_SOURCE") == "merge_request_event": - # For merge requests, the base_reference is the common ancestor between the MR and the target branch. + # For merge requests, the base_reference is the common ancestor between the MR and the target branch base_reference = os.getenv("CI_MERGE_REQUEST_DIFF_BASE_SHA") else: # When not in merge requests, the base reference is the Firefox tag - base_reference = get_firefox_tag_from_branch_name(os.getenv("CI_COMMIT_BRANCH")) + base_reference = get_firefox_tag(os.getenv("CI_COMMIT_BRANCH")) if not base_reference: raise RuntimeError("No base reference found. There might be more errors above.") # Fetch the tag reference git(f"fetch origin {base_reference} --depth=1 --filter=blob:none") - # Return the list of changed files - return git(f"diff --diff-filter=d --name-only {base_reference} HEAD").split("\n") + # Return but filter the issue_templates files because those file names have spaces which can cause issues + return git("diff --diff-filter=d --name-only FETCH_HEAD HEAD").split("\n") if __name__ == "__main__": - parser = argparse.ArgumentParser( - description="Run ./mach linters in CI. Warning: if you run this in your local environment it might mess up your git history." + parser = argparse.ArgumentParser(description="") + + parser.add_argument( + "--get-firefox-tag", + help="Get the Firefox tag related to a given (tor-mullvad-base)-browser tag or branch name.", + type=str, ) parser.add_argument( - "linters", metavar="L", type=str, nargs="+", help="A list of linters to run." + "--get-changed-files", + help="Get list of changed files." + "When running from a merge request get sthe list of changed files since the merge-base of the current branch." + "When running from a protected branch i.e. any branch that starts with <something>-browser-, gets the list of files changed since the FIREFOX_ tag.", + action="store_true", ) + args = parser.parse_args() - changed_files = get_list_of_changed_files() - if changed_files: - command = ["./mach", "lint", "-v"] - for linter in args.linters: - command.extend(["-l", linter]) - command.extend(changed_files) - result = subprocess.run(command, text=True) - sys.exit(result.returncode) + if args.get_firefox_tag: + print(get_firefox_tag(args.get_firefox_tag)) + elif args.get_changed_files: + print("\n".join(get_list_of_changed_files())) else: - print("No files changed, skipping linting.") + print("No valid option provided.") ===================================== .gitlab/ci/setup.yml ===================================== @@ -0,0 +1,53 @@ +setup-env: + stage: setup + interruptible: true + variables: + GIT_STRATEGY: "none" + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_REF_PROTECTED == 'true' + script: + - | + if [ -n "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" ]; then + echo "BRANCH_NAME=$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" > build.env + else + echo "BRANCH_NAME=$CI_COMMIT_REF_NAME" > build.env + fi + artifacts: + reports: + dotenv: + - build.env + +create-bundle: + stage: setup + # TODO: Find a better suited image, this one just has git. + image: python + needs: + - job: setup-env + artifacts: true + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' || $CI_COMMIT_REF_PROTECTED == 'true' + variables: + GIT_DEPTH: "1" + interruptible: true + script: + # DEBUG: Check repository status. + - git status + # Switch to a named branch. + - git switch -c $BRANCH_NAME + # Create a git bundle -- this will generate the app.bundle file, + # which can be used as a git remote for offline fetching. + - git bundle create app.bundle --all + # Retain the SHA of the base of this shallow repository. + - cat .git/shallow > shallow.txt + # DEBUG: Check sizes. + - du -sh .git + - du -sh app.bundle + # Since this is the only job we have access to the Gitlab remote, + # let's get a list of changed files to use in the next jobs. + - .gitlab/ci/scripts/helpers.py --get-changed-files > changedfiles.txt + artifacts: + paths: + - app.bundle + - shallow.txt + - changedfiles.txt + expire_in: 1 hour View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f4d44bf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f4d44bf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.1.0esr-14.0-1] fixup! Bug 40925: Implemented the Security Level component
by Pier Angelo Vendrame (＠pierov) 12 Aug '24

12 Aug '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 94c62b42 by Henry Wilkes at 2024-08-12T14:35:51+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 42699: Drop level="top" attribute. - - - - - 1 changed file: - browser/components/securitylevel/content/securityLevelPanel.inc.xhtml Changes: ===================================== browser/components/securitylevel/content/securityLevelPanel.inc.xhtml ===================================== @@ -4,7 +4,6 @@ aria-describedby="securityLevel-subheading securityLevel-summary" type="arrow" orient="vertical" - level="top" class="cui-widget-panel panel-no-padding"> <box class="panel-header"> <html:h1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/94c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/94c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.1.0esr-14.0-1] fixup! Bug 40925: Implemented the Security Level component
by Pier Angelo Vendrame (＠pierov) 12 Aug '24

12 Aug '24

Pier Angelo Vendrame pushed to branch base-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 234d4656 by Henry Wilkes at 2024-08-12T14:35:18+02:00 fixup! Bug 40925: Implemented the Security Level component Bug 42699: Drop level="top" attribute. - - - - - 1 changed file: - browser/components/securitylevel/content/securityLevelPanel.inc.xhtml Changes: ===================================== browser/components/securitylevel/content/securityLevelPanel.inc.xhtml ===================================== @@ -4,7 +4,6 @@ aria-describedby="securityLevel-subheading securityLevel-summary" type="arrow" orient="vertical" - level="top" class="cui-widget-panel panel-no-padding"> <box class="panel-header"> <html:h1 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/234d465… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/234d465… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] 2 commits: fixup! Bug 40925: Implemented the Security Level component
by Pier Angelo Vendrame (＠pierov) 12 Aug '24

12 Aug '24

Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: b44ee121 by Henry Wilkes at 2024-08-12T12:30:56+00:00 fixup! Bug 40925: Implemented the Security Level component Bug 42699: Drop level="top" attribute. - - - - - 29560ecc by Henry Wilkes at 2024-08-12T12:30:56+00:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 42699: Drop level="top" attribute. - - - - - 2 changed files: - browser/components/securitylevel/content/securityLevelPanel.inc.xhtml - browser/components/torcircuit/content/torCircuitPanel.inc.xhtml Changes: ===================================== browser/components/securitylevel/content/securityLevelPanel.inc.xhtml ===================================== @@ -4,7 +4,6 @@ aria-describedby="securityLevel-subheading securityLevel-summary" type="arrow" orient="vertical" - level="top" class="cui-widget-panel panel-no-padding"> <box class="panel-header"> <html:h1 ===================================== browser/components/torcircuit/content/torCircuitPanel.inc.xhtml ===================================== @@ -3,7 +3,6 @@ aria-labelledby="tor-circuit-heading" type="arrow" orient="vertical" - level="top" class="cui-widget-panel panel-no-padding" tabindex="0"> <!-- Use same semantic structure as #identity-popup and #protections-popup View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/402c32… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/402c32… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.1.0esr-14.0-1] 2 commits: fixup! Bug 40309: Avoid using regional OS locales
by Pier Angelo Vendrame (＠pierov) 12 Aug '24

12 Aug '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 94b53ebc by Pier Angelo Vendrame at 2024-08-12T11:51:21+02:00 fixup! Bug 40309: Avoid using regional OS locales Bug 42349: Change the RFPTarget in the region spoofing. One of our patches makes sure that when spoof English is not in use, we report the same locale as the app language, instead of reporting the OS locale (which is Firefox's default behavior when the app and OS languages are the same). When rebasing onto 128, we broke this patch because we had to specify an RFPTarget, and I chose RFPTarget::JSLocale. This is the only target that can be disabled even when running RFP instead of FFP, because it is controlled by privacy.spoof_english. - - - - - 8904c0be by Pier Angelo Vendrame at 2024-08-12T11:51:22+02:00 fixup! Firefox preference overrides. Add some notes about live-reload, discovered while investigating some localization issues. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - intl/locale/LocaleService.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -622,6 +622,9 @@ pref("corroborator.enabled", false); // tor-browser#41417: do not allow live reload until we switch to Fluent and // stop using .textContent. +// Even after that, it might be a good idea to keep it off, as it is not handled +// very well, and it might give a window during which websites could fingerprint +// the change (see tor-browser#42349 and tor-browser#42771). pref("intl.multilingual.liveReload", false); // Enable URL query stripping to protect against cross-site tracking (tor-browser#41092) ===================================== intl/locale/LocaleService.cpp ===================================== @@ -485,10 +485,12 @@ LocaleService::GetAppLocaleAsBCP47(nsACString& aRetVal) { NS_IMETHODIMP LocaleService::GetRegionalPrefsLocales(nsTArray<nsCString>& aRetVal) { + // tor-browser#42349, #42771: We cannot use JSLocale because it is spoof + // English. So, we use another target for now. if (nsContentUtils::ShouldResistFingerprinting( "This is probably a patch that should be refined. But to get the " "build going, we just keep applying this generic check.", - RFPTarget::JSLocale)) { + RFPTarget::JSDateTimeUTC)) { GetAppLocalesAsBCP47(aRetVal); return NS_OK; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/cf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/cf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.1.0esr-14.0-1] 2 commits: fixup! Bug 40309: Avoid using regional OS locales
by Pier Angelo Vendrame (＠pierov) 12 Aug '24

12 Aug '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 94b53ebc by Pier Angelo Vendrame at 2024-08-12T11:51:21+02:00 fixup! Bug 40309: Avoid using regional OS locales Bug 42349: Change the RFPTarget in the region spoofing. One of our patches makes sure that when spoof English is not in use, we report the same locale as the app language, instead of reporting the OS locale (which is Firefox's default behavior when the app and OS languages are the same). When rebasing onto 128, we broke this patch because we had to specify an RFPTarget, and I chose RFPTarget::JSLocale. This is the only target that can be disabled even when running RFP instead of FFP, because it is controlled by privacy.spoof_english. - - - - - 8904c0be by Pier Angelo Vendrame at 2024-08-12T11:51:22+02:00 fixup! Firefox preference overrides. Add some notes about live-reload, discovered while investigating some localization issues. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - intl/locale/LocaleService.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -622,6 +622,9 @@ pref("corroborator.enabled", false); // tor-browser#41417: do not allow live reload until we switch to Fluent and // stop using .textContent. +// Even after that, it might be a good idea to keep it off, as it is not handled +// very well, and it might give a window during which websites could fingerprint +// the change (see tor-browser#42349 and tor-browser#42771). pref("intl.multilingual.liveReload", false); // Enable URL query stripping to protect against cross-site tracking (tor-browser#41092) ===================================== intl/locale/LocaleService.cpp ===================================== @@ -485,10 +485,12 @@ LocaleService::GetAppLocaleAsBCP47(nsACString& aRetVal) { NS_IMETHODIMP LocaleService::GetRegionalPrefsLocales(nsTArray<nsCString>& aRetVal) { + // tor-browser#42349, #42771: We cannot use JSLocale because it is spoof + // English. So, we use another target for now. if (nsContentUtils::ShouldResistFingerprinting( "This is probably a patch that should be refined. But to get the " "build going, we just keep applying this generic check.", - RFPTarget::JSLocale)) { + RFPTarget::JSDateTimeUTC)) { GetAppLocalesAsBCP47(aRetVal); return NS_OK; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/cf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/cf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.1.0esr-14.0-1] 2 commits: fixup! Bug 40309: Avoid using regional OS locales
by Pier Angelo Vendrame (＠pierov) 12 Aug '24

12 Aug '24

Pier Angelo Vendrame pushed to branch base-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: b841c294 by Pier Angelo Vendrame at 2024-08-12T11:48:58+02:00 fixup! Bug 40309: Avoid using regional OS locales Bug 42349: Change the RFPTarget in the region spoofing. One of our patches makes sure that when spoof English is not in use, we report the same locale as the app language, instead of reporting the OS locale (which is Firefox's default behavior when the app and OS languages are the same). When rebasing onto 128, we broke this patch because we had to specify an RFPTarget, and I chose RFPTarget::JSLocale. This is the only target that can be disabled even when running RFP instead of FFP, because it is controlled by privacy.spoof_english. - - - - - 7d1059f5 by Pier Angelo Vendrame at 2024-08-12T11:48:59+02:00 fixup! Firefox preference overrides. Add some notes about live-reload, discovered while investigating some localization issues. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - intl/locale/LocaleService.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -624,6 +624,9 @@ pref("corroborator.enabled", false); // tor-browser#41417: do not allow live reload until we switch to Fluent and // stop using .textContent. +// Even after that, it might be a good idea to keep it off, as it is not handled +// very well, and it might give a window during which websites could fingerprint +// the change (see tor-browser#42349 and tor-browser#42771). pref("intl.multilingual.liveReload", false); // Enable URL query stripping to protect against cross-site tracking (tor-browser#41092) ===================================== intl/locale/LocaleService.cpp ===================================== @@ -485,10 +485,12 @@ LocaleService::GetAppLocaleAsBCP47(nsACString& aRetVal) { NS_IMETHODIMP LocaleService::GetRegionalPrefsLocales(nsTArray<nsCString>& aRetVal) { + // tor-browser#42349, #42771: We cannot use JSLocale because it is spoof + // English. So, we use another target for now. if (nsContentUtils::ShouldResistFingerprinting( "This is probably a patch that should be refined. But to get the " "build going, we just keep applying this generic check.", - RFPTarget::JSLocale)) { + RFPTarget::JSDateTimeUTC)) { GetAppLocalesAsBCP47(aRetVal); return NS_OK; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/562aec… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/562aec… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] 2 commits: fixup! Bug 40309: Avoid using regional OS locales
by Pier Angelo Vendrame (＠pierov) 12 Aug '24

12 Aug '24

Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 98b8bdd4 by Pier Angelo Vendrame at 2024-08-08T19:12:40+02:00 fixup! Bug 40309: Avoid using regional OS locales Bug 42349: Change the RFPTarget in the region spoofing. One of our patches makes sure that when spoof English is not in use, we report the same locale as the app language, instead of reporting the OS locale (which is Firefox's default behavior when the app and OS languages are the same). When rebasing onto 128, we broke this patch because we had to specify an RFPTarget, and I chose RFPTarget::JSLocale. This is the only target that can be disabled even when running RFP instead of FFP, because it is controlled by privacy.spoof_english. - - - - - 402c32c1 by Pier Angelo Vendrame at 2024-08-08T19:12:56+02:00 fixup! Firefox preference overrides. Add some notes about live-reload, discovered while investigating some localization issues. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - intl/locale/LocaleService.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -624,6 +624,9 @@ pref("corroborator.enabled", false); // tor-browser#41417: do not allow live reload until we switch to Fluent and // stop using .textContent. +// Even after that, it might be a good idea to keep it off, as it is not handled +// very well, and it might give a window during which websites could fingerprint +// the change (see tor-browser#42349 and tor-browser#42771). pref("intl.multilingual.liveReload", false); // Enable URL query stripping to protect against cross-site tracking (tor-browser#41092) ===================================== intl/locale/LocaleService.cpp ===================================== @@ -485,10 +485,12 @@ LocaleService::GetAppLocaleAsBCP47(nsACString& aRetVal) { NS_IMETHODIMP LocaleService::GetRegionalPrefsLocales(nsTArray<nsCString>& aRetVal) { + // tor-browser#42349, #42771: We cannot use JSLocale because it is spoof + // English. So, we use another target for now. if (nsContentUtils::ShouldResistFingerprinting( "This is probably a patch that should be refined. But to get the " "build going, we just keep applying this generic check.", - RFPTarget::JSLocale)) { + RFPTarget::JSDateTimeUTC)) { GetAppLocalesAsBCP47(aRetVal); return NS_OK; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/292271… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/292271… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] fixup! Bug 41600: Add a tor circuit display panel.
by morgan (＠morgan) 08 Aug '24

08 Aug '24

morgan pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 292271b7 by Henry Wilkes at 2024-08-08T17:52:46+01:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 42695: Use --arrowpanel variables instead of em units in the tor circuit display. - - - - - 1 changed file: - browser/components/torcircuit/content/torCircuitPanel.css Changes: ===================================== browser/components/torcircuit/content/torCircuitPanel.css ===================================== @@ -60,8 +60,8 @@ } #tor-circuit-alias:not([hidden]) { - /* Same margin as .panel-header > h1 */ - margin: 4px 0; + /* Same as padding for .panel-header */ + margin-block-start: var(--arrowpanel-menuitem-margin-inline); display: flex; align-items: center; } @@ -83,8 +83,10 @@ #tor-circuit-panel-body { /* May grow larger than 480px if we have a long domain name or ip address. */ min-width: 480px; - padding: 1em; - gap: 1em; + /* Line up with the button at the bottom of the panel. */ + margin: var(--arrowpanel-menuitem-margin); + padding: var(--arrowpanel-menuitem-padding); + gap: var(--arrowpanel-menuitem-padding-block); } #tor-circuit-node-list-name, @@ -95,7 +97,7 @@ #tor-circuit-node-list { line-height: 2; list-style: none; - padding-inline-start: 0.5em; + padding-inline-start: var(--arrowpanel-menuitem-margin-inline); /* Do not allow an item to wrap since this would break the circuit diagram. */ white-space: nowrap; } @@ -181,5 +183,5 @@ } .tor-circuit-button label.tor-circuit-button-description { - margin-block-start: 3px; + margin-block-start: var(--space-xsmall); } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/292271b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/292271b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] fixup! Bug 41600: Add a tor circuit display panel.
by Pier Angelo Vendrame (＠pierov) 08 Aug '24

08 Aug '24

Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 786db184 by Henry Wilkes at 2024-08-08T15:24:27+01:00 fixup! Bug 41600: Add a tor circuit display panel. Bug 42700: Remove !nodes condition from circuit panel. Also updated comment. - - - - - 1 changed file: - browser/components/torcircuit/content/torCircuitPanel.js Changes: ===================================== browser/components/torcircuit/content/torCircuitPanel.js ===================================== @@ -317,12 +317,11 @@ var gTorCircuitPanel = { this._currentBrowserData.domain === domain && this._currentBrowserData.scheme === scheme && this._currentBrowserData.nodes.length === nodes.length && - // If non-null, the fingerprints of the nodes match. - (!nodes || - nodes.every( - (n, index) => - n.fingerprint === this._currentBrowserData.nodes[index].fingerprint - )) + // The fingerprints of the nodes match. + nodes.every( + (n, index) => + n.fingerprint === this._currentBrowserData.nodes[index].fingerprint + ) ) { // No change. this._log.debug( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/786db18… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/786db18… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] 2 commits: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by Pier Angelo Vendrame (＠pierov) 08 Aug '24

08 Aug '24

Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 84eaa764 by Henry Wilkes at 2024-08-08T10:30:14+01:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42663: Add tooltip text to the "Connection" category. - - - - - 1208a39d by Henry Wilkes at 2024-08-08T10:35:05+01:00 fixup! Tor Browser strings Bug 42663: Add tooltip text to the "Connection" category. - - - - - 2 changed files: - browser/components/torpreferences/content/connectionCategory.inc.xhtml - toolkit/locales/en-US/toolkit/global/tor-browser.ftl Changes: ===================================== browser/components/torpreferences/content/connectionCategory.inc.xhtml ===================================== @@ -2,6 +2,8 @@ class="category" value="paneConnection" helpTopic="prefs-connection" + data-l10n-id="tor-connection-settings-category" + data-l10n-attrs="tooltiptext" align="center" hidden="true"> <image class="category-icon"/> ===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -49,6 +49,10 @@ home-mode-choice-tor = # "Connection" refers to the Tor Browser's connection to the Tor network. tor-connection-settings-heading = Connection +# The tooltip text for the "Connection" settings, shown in the preferences side bar. +# Likely should just be "{ tor-connection-settings-heading }", which will match the displayed text exactly. +tor-connection-settings-category = + .tooltiptext = { tor-connection-settings-heading } # -brand-short-name refers to 'Tor Browser', localized. tor-connection-overview = { -brand-short-name } routes your traffic over the Tor Network, run by thousands of volunteers around the world. tor-connection-browser-learn-more-link = Learn more View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5a97c2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/5a97c2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.1.0esr-14.0-1] 2 commits: fixup! Bug 42347: Add a notification for dropped OS version support.
by Pier Angelo Vendrame (＠pierov) 08 Aug '24

08 Aug '24

Pier Angelo Vendrame pushed to branch base-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 6da32b42 by Pier Angelo Vendrame at 2024-08-08T11:16:04+02:00 fixup! Bug 42347: Add a notification for dropped OS version support. Bug 43021: Revert "Bug 42347: Add a notification for dropped OS version support." This reverts commit d92ee42bf0523425b33583006fc94c787dca55cb. - - - - - 562aeca5 by Pier Angelo Vendrame at 2024-08-08T11:16:05+02:00 fixup! Base Browser strings This reverts commit 900fb923a95ec97a9c843085759fa08d961bd92c. - - - - - 4 changed files: - browser/base/content/browser.xhtml - − browser/base/content/droppedSupportNotification.js - browser/base/jar.mn - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/base/content/browser.xhtml ===================================== @@ -129,7 +129,6 @@ Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/shopping/shopping-sidebar.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this); - Services.scriptloader.loadSubScript("chrome://browser/content/droppedSupportNotification.js", this); window.onload = gBrowserInit.onLoad.bind(gBrowserInit); window.onunload = gBrowserInit.onUnload.bind(gBrowserInit); ===================================== browser/base/content/droppedSupportNotification.js deleted ===================================== @@ -1,69 +0,0 @@ -"use strict"; - -// Show a prompt that a user's system will no longer be supported. -window.addEventListener("load", () => { - let labelId; - // Expire date is 2024-10-01 (1st October 2024). - const isExpired = Date.now() > Date.UTC(2024, 9, 1); - - if ( - AppConstants.platform === "macosx" && - Services.vc.compare( - Services.sysinfo.getProperty("version"), - "19.0" // MacOS 10.15 begins with Darwin 19.0 - ) < 0 - ) { - labelId = isExpired - ? "dropped-support-notification-macos-version-less-than-10-15-expired" - : "dropped-support-notification-macos-version-less-than-10-15"; - } else if ( - AppConstants.platform === "win" && - Services.vc.compare(Services.sysinfo.getProperty("version"), "10.0") < 0 - ) { - labelId = isExpired - ? "dropped-support-notification-win-os-version-less-than-10-expired" - : "dropped-support-notification-win-os-version-less-than-10"; - } - - const dismissedPref = - "browser.dropped_support_notification_v14.dismiss_version"; - - if (!labelId) { - // Avoid setting any preferences for supported versions, and clean up any - // old values if the user ported their profile. - Services.prefs.clearUserPref(dismissedPref); - return; - } - - if ( - !isExpired && - Services.prefs.getStringPref(dismissedPref, "") === - AppConstants.BASE_BROWSER_VERSION - ) { - // Already dismissed since the last update. - return; - } - - const buttons = isExpired - ? undefined - : [ - { - "l10n-id": "dropped-support-notification-dismiss-button", - callback: () => { - Services.prefs.setStringPref( - dismissedPref, - AppConstants.BASE_BROWSER_VERSION - ); - }, - }, - ]; - - gNotificationBox.appendNotification( - "dropped-support-notification", - { - label: { "l10n-id": labelId }, - priority: gNotificationBox.PRIORITY_WARNING_HIGH, - }, - buttons - ); -}); ===================================== browser/base/jar.mn ===================================== @@ -99,5 +99,4 @@ browser.jar: content/browser/spotlight.js (content/spotlight.js) * content/browser/default-bookmarks.html (content/default-bookmarks.html) - content/browser/droppedSupportNotification.js (content/droppedSupportNotification.js) content/browser/languageNotification.js (content/languageNotification.js) ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -166,21 +166,3 @@ security-level-summary-custom = Your custom browser preferences have resulted in # Button to undo custom changes to the security level and place the user in one of the standard security levels. # Shown in the security level panel and settings. security-level-restore-defaults-button = Restore defaults - -## Notification for dropped operating system support. - -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". -# "14.0" refers to the browser versions number: Tor Browser 14.0. -# "macOS" is a brand name, and 10.15 is the macOS version number. -dropped-support-notification-macos-version-less-than-10-15 = The next major version of { -brand-short-name } (14.0) will no longer support this version of macOS. Please upgrade to macOS 10.15 or later by October 1st 2024 to continue receiving important security updates. -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". -# "macOS" is a brand name, and 10.15 is the macOS version number. -dropped-support-notification-macos-version-less-than-10-15-expired = { -brand-short-name } no longer supports this version of macOS. Please upgrade to macOS 10.15 or later to continue receiving important security updates. -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". -# "14.0" refers to the browser versions number: Tor Browser 14.0. -# "Windows" is a brand name, and "Windows 10" is the version. -dropped-support-notification-win-os-version-less-than-10 = The next major version of { -brand-short-name } (14.0) will no longer support this version of Windows. Please upgrade to Windows 10 or later by October 1st 2024 to continue receiving important security updates. -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". -# "Windows" is a brand name, and "Windows 10" is the version. -dropped-support-notification-win-os-version-less-than-10-expired = { -brand-short-name } no longer supports this version of Windows. Please upgrade to Windows 10 or later to continue receiving important security updates. -dropped-support-notification-dismiss-button = Got it View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a67e45… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/a67e45… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.1.0esr-14.0-1] 2 commits: fixup! Bug 42347: Add a notification for dropped OS version support.
by Pier Angelo Vendrame (＠pierov) 08 Aug '24

08 Aug '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 82a0c757 by Pier Angelo Vendrame at 2024-08-08T11:12:20+02:00 fixup! Bug 42347: Add a notification for dropped OS version support. Bug 43021: Revert "Bug 42347: Add a notification for dropped OS version support." This reverts commit d92ee42bf0523425b33583006fc94c787dca55cb. - - - - - cf53e4fd by Pier Angelo Vendrame at 2024-08-08T11:12:22+02:00 fixup! Base Browser strings This reverts commit 900fb923a95ec97a9c843085759fa08d961bd92c. - - - - - 4 changed files: - browser/base/content/browser.xhtml - − browser/base/content/droppedSupportNotification.js - browser/base/jar.mn - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/base/content/browser.xhtml ===================================== @@ -129,7 +129,6 @@ Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/shopping/shopping-sidebar.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this); - Services.scriptloader.loadSubScript("chrome://browser/content/droppedSupportNotification.js", this); window.onload = gBrowserInit.onLoad.bind(gBrowserInit); window.onunload = gBrowserInit.onUnload.bind(gBrowserInit); ===================================== browser/base/content/droppedSupportNotification.js deleted ===================================== @@ -1,69 +0,0 @@ -"use strict"; - -// Show a prompt that a user's system will no longer be supported. -window.addEventListener("load", () => { - let labelId; - // Expire date is 2024-10-01 (1st October 2024). - const isExpired = Date.now() > Date.UTC(2024, 9, 1); - - if ( - AppConstants.platform === "macosx" && - Services.vc.compare( - Services.sysinfo.getProperty("version"), - "19.0" // MacOS 10.15 begins with Darwin 19.0 - ) < 0 - ) { - labelId = isExpired - ? "dropped-support-notification-macos-version-less-than-10-15-expired" - : "dropped-support-notification-macos-version-less-than-10-15"; - } else if ( - AppConstants.platform === "win" && - Services.vc.compare(Services.sysinfo.getProperty("version"), "10.0") < 0 - ) { - labelId = isExpired - ? "dropped-support-notification-win-os-version-less-than-10-expired" - : "dropped-support-notification-win-os-version-less-than-10"; - } - - const dismissedPref = - "browser.dropped_support_notification_v14.dismiss_version"; - - if (!labelId) { - // Avoid setting any preferences for supported versions, and clean up any - // old values if the user ported their profile. - Services.prefs.clearUserPref(dismissedPref); - return; - } - - if ( - !isExpired && - Services.prefs.getStringPref(dismissedPref, "") === - AppConstants.BASE_BROWSER_VERSION - ) { - // Already dismissed since the last update. - return; - } - - const buttons = isExpired - ? undefined - : [ - { - "l10n-id": "dropped-support-notification-dismiss-button", - callback: () => { - Services.prefs.setStringPref( - dismissedPref, - AppConstants.BASE_BROWSER_VERSION - ); - }, - }, - ]; - - gNotificationBox.appendNotification( - "dropped-support-notification", - { - label: { "l10n-id": labelId }, - priority: gNotificationBox.PRIORITY_WARNING_HIGH, - }, - buttons - ); -}); ===================================== browser/base/jar.mn ===================================== @@ -99,5 +99,4 @@ browser.jar: content/browser/spotlight.js (content/spotlight.js) * content/browser/default-bookmarks.html (content/default-bookmarks.html) - content/browser/droppedSupportNotification.js (content/droppedSupportNotification.js) content/browser/languageNotification.js (content/languageNotification.js) ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -166,21 +166,3 @@ security-level-summary-custom = Your custom browser preferences have resulted in # Button to undo custom changes to the security level and place the user in one of the standard security levels. # Shown in the security level panel and settings. security-level-restore-defaults-button = Restore defaults - -## Notification for dropped operating system support. - -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". -# "14.0" refers to the browser versions number: Tor Browser 14.0. -# "macOS" is a brand name, and 10.15 is the macOS version number. -dropped-support-notification-macos-version-less-than-10-15 = The next major version of { -brand-short-name } (14.0) will no longer support this version of macOS. Please upgrade to macOS 10.15 or later by October 1st 2024 to continue receiving important security updates. -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". -# "macOS" is a brand name, and 10.15 is the macOS version number. -dropped-support-notification-macos-version-less-than-10-15-expired = { -brand-short-name } no longer supports this version of macOS. Please upgrade to macOS 10.15 or later to continue receiving important security updates. -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". -# "14.0" refers to the browser versions number: Tor Browser 14.0. -# "Windows" is a brand name, and "Windows 10" is the version. -dropped-support-notification-win-os-version-less-than-10 = The next major version of { -brand-short-name } (14.0) will no longer support this version of Windows. Please upgrade to Windows 10 or later by October 1st 2024 to continue receiving important security updates. -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". -# "Windows" is a brand name, and "Windows 10" is the version. -dropped-support-notification-win-os-version-less-than-10-expired = { -brand-short-name } no longer supports this version of Windows. Please upgrade to Windows 10 or later to continue receiving important security updates. -dropped-support-notification-dismiss-button = Got it View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/65… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/65… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] 2 commits: fixup! Bug 42347: Add a notification for dropped OS version support.
by Pier Angelo Vendrame (＠pierov) 08 Aug '24

08 Aug '24

Pier Angelo Vendrame pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: be034bda by Pier Angelo Vendrame at 2024-08-08T11:06:16+02:00 fixup! Bug 42347: Add a notification for dropped OS version support. Bug 43021: Revert "Bug 42347: Add a notification for dropped OS version support." This reverts commit d92ee42bf0523425b33583006fc94c787dca55cb. - - - - - 5a97c2df by Pier Angelo Vendrame at 2024-08-08T11:06:19+02:00 fixup! Base Browser strings This reverts commit 900fb923a95ec97a9c843085759fa08d961bd92c. - - - - - 4 changed files: - browser/base/content/browser.xhtml - − browser/base/content/droppedSupportNotification.js - browser/base/jar.mn - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/base/content/browser.xhtml ===================================== @@ -138,7 +138,6 @@ Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/shopping/shopping-sidebar.js", this); Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this); - Services.scriptloader.loadSubScript("chrome://browser/content/droppedSupportNotification.js", this); window.onload = gBrowserInit.onLoad.bind(gBrowserInit); window.onunload = gBrowserInit.onUnload.bind(gBrowserInit); ===================================== browser/base/content/droppedSupportNotification.js deleted ===================================== @@ -1,69 +0,0 @@ -"use strict"; - -// Show a prompt that a user's system will no longer be supported. -window.addEventListener("load", () => { - let labelId; - // Expire date is 2024-10-01 (1st October 2024). - const isExpired = Date.now() > Date.UTC(2024, 9, 1); - - if ( - AppConstants.platform === "macosx" && - Services.vc.compare( - Services.sysinfo.getProperty("version"), - "19.0" // MacOS 10.15 begins with Darwin 19.0 - ) < 0 - ) { - labelId = isExpired - ? "dropped-support-notification-macos-version-less-than-10-15-expired" - : "dropped-support-notification-macos-version-less-than-10-15"; - } else if ( - AppConstants.platform === "win" && - Services.vc.compare(Services.sysinfo.getProperty("version"), "10.0") < 0 - ) { - labelId = isExpired - ? "dropped-support-notification-win-os-version-less-than-10-expired" - : "dropped-support-notification-win-os-version-less-than-10"; - } - - const dismissedPref = - "browser.dropped_support_notification_v14.dismiss_version"; - - if (!labelId) { - // Avoid setting any preferences for supported versions, and clean up any - // old values if the user ported their profile. - Services.prefs.clearUserPref(dismissedPref); - return; - } - - if ( - !isExpired && - Services.prefs.getStringPref(dismissedPref, "") === - AppConstants.BASE_BROWSER_VERSION - ) { - // Already dismissed since the last update. - return; - } - - const buttons = isExpired - ? undefined - : [ - { - "l10n-id": "dropped-support-notification-dismiss-button", - callback: () => { - Services.prefs.setStringPref( - dismissedPref, - AppConstants.BASE_BROWSER_VERSION - ); - }, - }, - ]; - - gNotificationBox.appendNotification( - "dropped-support-notification", - { - label: { "l10n-id": labelId }, - priority: gNotificationBox.PRIORITY_WARNING_HIGH, - }, - buttons - ); -}); ===================================== browser/base/jar.mn ===================================== @@ -105,5 +105,4 @@ browser.jar: content/browser/spotlight.js (content/spotlight.js) * content/browser/default-bookmarks.html (content/default-bookmarks.html) - content/browser/droppedSupportNotification.js (content/droppedSupportNotification.js) content/browser/languageNotification.js (content/languageNotification.js) ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -166,21 +166,3 @@ security-level-summary-custom = Your custom browser preferences have resulted in # Button to undo custom changes to the security level and place the user in one of the standard security levels. # Shown in the security level panel and settings. security-level-restore-defaults-button = Restore defaults - -## Notification for dropped operating system support. - -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". -# "14.0" refers to the browser versions number: Tor Browser 14.0. -# "macOS" is a brand name, and 10.15 is the macOS version number. -dropped-support-notification-macos-version-less-than-10-15 = The next major version of { -brand-short-name } (14.0) will no longer support this version of macOS. Please upgrade to macOS 10.15 or later by October 1st 2024 to continue receiving important security updates. -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". -# "macOS" is a brand name, and 10.15 is the macOS version number. -dropped-support-notification-macos-version-less-than-10-15-expired = { -brand-short-name } no longer supports this version of macOS. Please upgrade to macOS 10.15 or later to continue receiving important security updates. -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". -# "14.0" refers to the browser versions number: Tor Browser 14.0. -# "Windows" is a brand name, and "Windows 10" is the version. -dropped-support-notification-win-os-version-less-than-10 = The next major version of { -brand-short-name } (14.0) will no longer support this version of Windows. Please upgrade to Windows 10 or later by October 1st 2024 to continue receiving important security updates. -# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser". -# "Windows" is a brand name, and "Windows 10" is the version. -dropped-support-notification-win-os-version-less-than-10-expired = { -brand-short-name } no longer supports this version of Windows. Please upgrade to Windows 10 or later to continue receiving important security updates. -dropped-support-notification-dismiss-button = Got it View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4f0cf0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4f0cf0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5] Bump lyrebird version to 0.3.0
by morgan (＠morgan) 08 Aug '24

08 Aug '24

morgan pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: aa66852e by meskio at 2024-08-07T23:24:04+00:00 Bump lyrebird version to 0.3.0 - - - - - 1 changed file: - projects/lyrebird/config Changes: ===================================== projects/lyrebird/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.0 +version: 0.3.0 git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyre… git_hash: 'lyrebird-[% c("version") %]' tag_gpg_id: 1 @@ -9,7 +9,7 @@ container: use_container: 1 var: - go_vendor_sha256sum: dc6b2671250f4ffd0caff3ef020bd60f99207f519f6f5f1be47243677a13c695 + go_vendor_sha256sum: 71abc8063f2913e74e87a2a5c9262c4fad6ce4ed98b28b7603b50382724baba4 targets: nightly: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bump lyrebird version to 0.3.0
by morgan (＠morgan) 07 Aug '24

07 Aug '24

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 00062f02 by meskio at 2024-08-07T23:03:10+00:00 Bump lyrebird version to 0.3.0 - - - - - 1 changed file: - projects/lyrebird/config Changes: ===================================== projects/lyrebird/config ===================================== @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.0 +version: 0.3.0 git_url: https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/lyre… git_hash: 'lyrebird-[% c("version") %]' tag_gpg_id: 1 @@ -9,7 +9,7 @@ container: use_container: 1 var: - go_vendor_sha256sum: dc6b2671250f4ffd0caff3ef020bd60f99207f519f6f5f1be47243677a13c695 + go_vendor_sha256sum: 71abc8063f2913e74e87a2a5c9262c4fad6ce4ed98b28b7603b50382724baba4 targets: nightly: View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] fixup! Bug 42683: Create script to generate issue triage csv file from bugzilla query and git logs
by morgan (＠morgan) 07 Aug '24

07 Aug '24

morgan pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 4f0cf02d by Beatriz Rizental at 2024-08-07T23:07:38+00:00 fixup! Bug 42683: Create script to generate issue triage csv file from bugzilla query and git logs - - - - - 1 changed file: - tools/torbrowser/generate-bugzilla-triage-csv.sh Changes: ===================================== tools/torbrowser/generate-bugzilla-triage-csv.sh ===================================== @@ -158,7 +158,7 @@ printf "\n]\n" >> "${git_json}" query_tail="&f1=product&n1=1&o1=anyexact&v1=Thunderbird%2CCalendar%2CChat%20Core%2CMailNews%20Core&f2=target_milestone&o2=substring&v2=${firefox_version}&limit=0" bugzilla_query="https://bugzilla.mozilla.org/buglist.cgi?${query_tail}" -bugzilla_json_query="https://bugzilla.mozilla.org/rest/bug?include_fields=id,summary${query_tail}" +bugzilla_json_query="https://bugzilla.mozilla.org/rest/bug?include_fields=id,component,summary${…" wget "${bugzilla_json_query}" -O ${bugzilla_json} @@ -174,13 +174,14 @@ jq -s '[ (.[0].bugs)[], (.[1])[] ] | group_by(.id) | map(.[0])' "${bugzilla_json # Generate Triage CSV # -echo "\"Review\",,\"Bugzilla Bug\"" +echo "\"Review\",,\"Bugzilla Component\",\"Bugzilla Bug\"" -jq '. | sort_by(.id)[] | "\(.id)|\(.summary)"' ${union_json} \ -| while IFS='|' read -r id summary; do +jq '. | sort_by([.component, .id])[] | "\(.id)|\(.component)|\(.summary)"' ${union_json} \ +| while IFS='|' read -r id component summary; do # bugzilla info id="${id:1}" + component="${component:0}" summary="${summary:0:-1}" summary=$(jq_unescape "${summary}") # short summary for gitlab issue title @@ -207,6 +208,7 @@ jq '. | sort_by(.id)[] | "\(.id)|\(.summary)"' ${union_json} \ echoerr "Skipped Bugzilla ${id}: ${summary_short}" else csv_summary=$(csv_escape "${summary}") + csv_component=$(csv_escape "${component}") # parent issue bugzilla_url="https://bugzilla.mozilla.org/show_bug.cgi?id=${id}" @@ -221,7 +223,7 @@ jq '. | sort_by(.id)[] | "\(.id)|\(.summary)"' ${union_json} \ create_issue=$(csv_escape "=HYPERLINK(\"${new_issue_url}\", \"New Issue\")") bugzilla_link=$(csv_escape "=HYPERLINK(\"${bugzilla_url}\", \"Bugzilla ${id}: ${csv_summary}\")") - echo "FALSE,\"${create_issue}\",\"${bugzilla_link}\"," + echo "FALSE,\"${create_issue}\",\"${csv_component}\",\"${bugzilla_link}\"," fi done View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4f0cf02… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4f0cf02… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.1.0esr-14.0-1] 3 commits: fixup! Bug 7494: Create local home page for TBB.
by morgan (＠morgan) 07 Aug '24

07 Aug '24

morgan pushed to branch tor-browser-128.1.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 732e4181 by Henry Wilkes at 2024-08-07T22:56:00+00:00 fixup! Bug 7494: Create local home page for TBB. Bug 42713: Use `--link-color` rather than `--in-content-link-color`. - - - - - fbf19afe by Henry Wilkes at 2024-08-07T22:56:00+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 42713: Use `--text-color-error` instead of `--in-content-error-text-color`. - - - - - da08e423 by Henry Wilkes at 2024-08-07T22:56:00+00:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Bug 42713: Use `--text-color-error` instead of `--in-content-error-text-color`. - - - - - 3 changed files: - browser/components/abouttor/content/aboutTor.css - browser/components/torpreferences/content/torPreferences.css - toolkit/components/torconnect/content/aboutTorConnect.css Changes: ===================================== browser/components/abouttor/content/aboutTor.css ===================================== @@ -194,14 +194,14 @@ body:not(.show-tor-check) #tor-check { --in-content-page-color: #fbfbfe; --in-content-text-color: #fbfbfe; color: var(--in-content-text-color); - --in-content-link-color: var(--purple-30); + --link-color: var(--purple-30); /* FIXME: Since we have a dark background, the color should get lighter on * hover, but --purple-40 and --pruple-50 are darker than --purple-30. * However, we do not have a standard lighter purple in our current set of * Photon colors. * See tor-browser#42025 */ - --in-content-link-color-hover: var(--purple-40); - --in-content-link-color-active: var(--purple-50); + --link-color-hover: var(--purple-40); + --link-color-active: var(--purple-50); } #search-form { ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -913,7 +913,7 @@ dialog#torPreferences-requestBridge-dialog > hbox { } #lox-invite-dialog-error-message { - color: var(--in-content-error-text-color); + color: var(--text-color-error); } #lox-invite-dialog-generate-area:not(.show-error) #lox-invite-dialog-error-message { @@ -1049,7 +1049,7 @@ groupbox#torPreferences-bridges-group textarea { } #user-provide-bridge-error-message { - color: var(--in-content-error-text-color); + color: var(--text-color-error); } #user-provide-bridge-dialog:not(.show-error) #user-provide-bridge-error-message { ===================================== toolkit/components/torconnect/content/aboutTorConnect.css ===================================== @@ -154,7 +154,7 @@ button { } #locationDropdownLabel.error { - color: var(--in-content-error-text-color) + color: var(--text-color-error) } #tryBridgeButton.danger-button { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fdad7c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fdad7c… You're receiving this email because of your account on gitlab.torproject.org.

1 0