July 2024 - tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-128.0esr-14.0-1] fixup! Firefox preference overrides.
by ma1 (＠ma1) 23 Jul '24

23 Jul '24

ma1 pushed to branch tor-browser-128.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 21b3574f by hackademix at 2024-07-23T11:40:05+02:00 fixup! Firefox preference overrides. Bug 42687: Disable Privacy-Preserving Attribution. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -230,6 +230,9 @@ pref("privacy.annotate_channels.strict_list.enabled", false); // Disable the Pocket extension (Bug #18886 and #31602) pref("extensions.pocket.enabled", false); +// Disable Privacy-Preserving-Attribution (Bug #42687) +pref("dom.private-attribution.submission.enabled", false); + // Custom extensions preferences tor-browser#41581 pref("extensions.hideNoScript", true); pref("extensions.hideUnifiedWhenEmpty", true); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/21b3574… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/21b3574… You're receiving this email because of your account on gitlab.torproject.org.

1 0

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

22 Jul '24

morgan pushed to branch tor-browser-128.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: a0092907 by Richard Pospesel at 2024-07-22T21:52:45+00:00 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 ===================================== @@ -0,0 +1,237 @@ +#!/usr/bin/env bash + +# prints to stderr +function echoerr() { echo "$@" 1>&2; } + +# help dialog +if [ "$#" -lt 5 ]; then + echoerr "Usage: $0 ff-version begin-commit end-commit gitlab-audit-issue reviewers..." + echoerr "" + echoerr "Writes a CSV to stdout of Bugzilla issues to triage for a particular Firefox version. This" + echoerr "script performs a union of the labeled Bugzilla issues in Mozilla's issue tracker and the" + echoerr "labeled commits in the provided commit range" + echoerr + echoerr " ff-version rapid-release Firefox version to audit" + echoerr " begin-commit starting gecko-dev commit of this Firefox version" + echoerr " end-commit ending gecko-dev commit of this Firefox version" + echoerr " gitlab-audit-issue tor-browser-spec Gitlab issue number for this audit" + echoerr " reviewers... space-separated list of reviewers responsible for this audit" + echoerr "" + echoerr "Example:" + echoerr "" + echoerr "$0 116 FIREFOX_ESR_115_BASE FIREFOX_116_0_3_RELEASE 40064 richard pierov henry" + exit 1 +fi + +# set -x +set -e + + +# Ensure various required tools are available +function check_exists() { + local cmd=$1 + if ! which ${cmd} > /dev/null ; then + echoerr "missing ${cmd} dependency" + exit 1 + fi +} + +check_exists git +check_exists jq +check_exists mktemp +check_exists perl +check_exists printf +check_exists sed +check_exists sort +check_exists touch +check_exists uniq +check_exists wget + +# Assign arguments to named variables +firefox_version=$1 +git_begin=$2 +git_end=$3 +audit_issue=$4 +reviewers="${@:5}" + +# Check valid Firefox version +if ! [[ "${firefox_version}" =~ ^[1-9][0-9]{2}$ ]]; then + echoerr "invalid Firefox version (probably)" + exit 1 +fi + +# Check valid Gitlab issue number +if ! [[ "${audit_issue}" =~ ^[1-9][0-9]{4}$ ]]; then + echoerr "invalid gitlab audit issue number (probably)" + exit 1 +fi + +# +# Encoding/Decoding Functions +# + +# escape " and \ +function json_escape() { + local input="$1" + echo "${input}" | sed 's/["\]/\\"/g' +} + + +# un-escape \" +function jq_unescape() { + local input="$1" + echo "${input}" | sed 's/\\"/"/g' +} + +# change quotes to double-quotes +function csv_escape() { + local input="$1" + echo "${input}" | sed 's/"/""/g' +} + +# we need to urlencode the strings used in the new issue link +function url_encode() { + local input="$1" + echo "${input}" | perl -MURI::Escape -wlne 'print uri_escape $_' +} + + +# +# Create temp json files +# +git_json=$(mktemp -t git-audit-${firefox_version}-XXXXXXXXXXX.json) +bugzilla_json=$(mktemp -t bugzilla-audit-${firefox_version}-XXXXXXXXXXX.json) +union_json=$(mktemp -t union-audit-${firefox_version}-XXXXXXXXXXX.json) +touch "${git_json}" +touch "${bugzilla_json}" +touch "${union_json}" + +function json_cleanup { + rm -f "${git_json}" + rm -f "${bugzilla_json}" + rm -f "${union_json}" +} +trap json_cleanup EXIT + +# +# Generate Git Commit Triage List +# + +# Try and extract bug id and summary from git log +# Mozilla's commits are not always 100% consistently named, so this +# regex is a bit flexible to handle various inputs such as: +# "Bug 1234 -", "Bug 1234:", "Bug Bug 1234 -", "[Bug 1234] -", " bug 1234 -". +sed_extract_id_summary="s/^[[ ]*[bug –-]+ ([1-9][0-9]*)[]:\., –-]*(.*)\$/\\1 \\2/pI" + +# Generate a json array of objects in the same format as bugzilla: {id: number, summary: string} +printf "[\n" >> "${git_json}" + +first_object=true +git log --format='%s' $git_begin..$git_end \ +| sed -En "${sed_extract_id_summary}" \ +| sort -h \ +| uniq \ +| while IFS= read -r line; do + read -r id summary <<< "${line}" + summary=$(json_escape "${summary}") + + # json does not allow trailing commas + if [[ "${first_object}" = true ]]; then + first_object=false + else + printf ",\n" >> "${git_json}" + fi + + printf " { \"id\": %s, \"summary\": \"%s\" }" ${id} "${summary}" >> "${git_json}" +done +printf "\n]\n" >> "${git_json}" + +# +# Download Bugzilla Triage List +# + +# search for: +# + Product is NOT "Thunderbird,Calander,Chat Core,MailNews Core" (&f1=product&n1=1&o1=anyexact&v1=Thunderbird%2CCalendar%2CChat%20Core%2CMailNews%20Core). AND +# + Target Milestone contains "${firefox_version}" (115 Branch or Firefox 115) (&f2=target_milestone&o2=substring&v2=${firefox_version}). +# "&limit=0" shows all matching bugs. + +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}" + +wget "${bugzilla_json_query}" -O ${bugzilla_json} + + +# +# Create Union of these two sets of issues +# + +# bugzilla array is actually on a root object: { bugs: [...] } +jq -s '[ (.[0].bugs)[], (.[1])[] ] | group_by(.id) | map(.[0])' "${bugzilla_json}" "${git_json}" > "${union_json}" + +# +# Generate Triage CSV +# + +echo "\"Review\",,\"Bugzilla Bug\"" + +jq '. | sort_by(.id)[] | "\(.id)|\(.summary)"' ${union_json} \ +| while IFS='|' read -r id summary; do + + # bugzilla info + id="${id:1}" + summary="${summary:0:-1}" + summary=$(jq_unescape "${summary}") + # short summary for gitlab issue title + [[ ${#summary} -gt 80 ]] && summary_short="${summary:0:77}..." || summary_short="${summary}" + + # filter out some issue types that we never care about + skip_issue=false + + # skip `[wpt-sync] Sync PR` + if [[ "${summary}" =~ ^\[wpt-sync\]\ Sync\ PR.*$ ]]; then + skip_issue=true + # skip `Crash in [@` and variants + elif [[ "${summary}" =~ ^Crash[esin\ ]*\ \[\@.*$ ]]; then + skip_issue=true + # skip `Assertion failuire: ` + elif [[ "${summary}" =~ ^Assertion\ failure:\ .*$ ]]; then + skip_issue=true + # skip `Hit MOZ_CRASH` + elif [[ "${summary}" =~ ^Hit\ MOZ_CRASH.*$ ]]; then + skip_issue=true + fi + + if [[ "${skip_issue}" = true ]]; then + echoerr "Skipped Bugzilla ${id}: ${summary_short}" + else + csv_summary=$(csv_escape "${summary}") + + # parent issue + bugzilla_url="https://bugzilla.mozilla.org/show_bug.cgi?id=${id}" + # review issue title + new_issue_title=$(url_encode "Review Mozilla ${id}: ${summary_short}") + # review issue description + labeling (14.0 stable, FF128-esr, Next) + new_issue_description=$(url_encode "### Bugzilla: ${bugzilla_url}")%0A$(url_encode "/label ~\"14.0 stable\" ~FF128-esr ~Next")%0A$(url_encode "/relate tpo/applications/tor-browser-spec#${audit_issue}")%0A%0A$(url_encode "")%0A + # url which create's new issue with title and description pre-populated + new_issue_url="https://gitlab.torproject.org/tpo/applications/tor-browser/-/issues/new?iss…" + + # this link will start the creation of a new gitlab issue to review + 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}\"," + fi +done + +echo +echo "\"Triaged by:\"" +for reviewer in $reviewers; do + reviewer=$(csv_escape "${reviewer}") + echo "\"FALSE\",\"${reviewer}\"" +done +echo + +bugzilla_query="=HYPERLINK(\"${bugzilla_query}\", \"Bugzilla query\")" +echo \"$(csv_escape "${bugzilla_query}")\" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a009290… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a009290… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41168: Check that we are not changing other channel when deploying update_responses
by richard (＠richard) 18 Jul '24

18 Jul '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 2303997c by Nicolas Vigier at 2024-07-17T16:45:08+02:00 Bug 41168: Check that we are not changing other channel when deploying update_responses - - - - - 1 changed file: - tools/signing/upload-update_responses-to-staticiforme Changes: ===================================== tools/signing/upload-update_responses-to-staticiforme ===================================== @@ -63,6 +63,18 @@ echo "update_responses_commit: $update_responses_commit" cd "$update_dir" git fetch +changed_files="\$(git diff --name-only HEAD $update_responses_commit)" +if ! echo "\$changed_files" | grep -qv "$tbb_version_type" +then + echo >&2 "Error: checking out new update_response_commit will changes" + echo >&2 "some files outside of the $tbb_version_type directory:" + echo "\$changed_files" | grep -v "$tbb_version_type" >&2 + echo >&2 "--" + echo >&2 "If this is really what you want to do, edit this script to" + echo >&2 "remove the line 'exit 1' and run it again." + echo >&2 "See tor-browser-build#41168 for more details." + exit 1 +fi git checkout "$update_responses_commit" static-update-component aus1.torproject.org View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.0esr-14.0-1] 2 commits: fixup! Add CI for Base Browser
by Pier Angelo Vendrame (＠pierov) 18 Jul '24

18 Jul '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 7e9be9ca by Beatriz Rizental at 2024-07-18T11:34:53+02:00 fixup! Add CI for Base Browser Bug 42722: Use custom Dockerfile for lint CI jobs to address missing dependencies issues with clang-format and l10n linters. - - - - - 7d8ea45c by Beatriz Rizental at 2024-07-18T11:34:54+02:00 fixup! Add CI for Base Browser Bug 42722: Cache mozbuild path instead of specifically the pip path - - - - - 4 changed files: - .gitlab-ci.yml - + .gitlab/ci/docker/base/Dockerfile - .gitlab/ci/lint.yml - .gitlab/ci/scripts/run_linters.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,5 +1,8 @@ stages: - lint +variables: + IMAGE_PATH: containers.torproject.org/tpo/applications/tor-browser/base:latest + include: - local: '.gitlab/ci/lint.yml' ===================================== .gitlab/ci/docker/base/Dockerfile ===================================== @@ -0,0 +1,69 @@ +FROM debian:latest + +# Base image which includes all* dependencies checked by ./mach configure. +# +# * Actually not all dependencies. WASM sandboxed depencies were left out for now. +# This installs all dependencies checked by `./mach configure --without-wasm-sandboxed-libraries`. +# +# # Building and publishing +# +# Whenever this file changes, the updated Docker image must be built and published _manually_ to +# the tor-browser container registry (https://gitlab.torproject.org/tpo/applications/tor-browser/container_regist…) +# +# This image copies a script from the taskcluster/ folder, which requires it +# to be built from a folder which is a parent of the taskcluster/ folder. +# +# To build, run: +# +# ```bash +# docker build \ +# -f <PATH_TO_DOCKERFILE> \ +# -t <REGISTRY_URL>/<IMAGE_NAME>:<IMAGE_TAG> +# . +# ``` +# +# For example, when building from the root of this repository to the main tor-browser repository +# and assuming image name to be "base" and tag "latest" -- which is the current terminology: +# +# ```bash +# docker build \ +# -f .gitlab/ci/docker/Dockerfile \ +# -t containers.torproject.org/tpo/applications/tor-browser/base:latest +# . +# ``` + +RUN apt-get update && apt-get install -y \ + clang \ + curl \ + git \ + libasound2-dev \ + libdbus-glib-1-dev \ + libgtk-3-dev \ + libpango1.0-dev \ + libpulse-dev \ + libx11-xcb-dev \ + libxcomposite-dev \ + libxcursor-dev \ + libxdamage-dev \ + libxi-dev \ + libxrandr-dev \ + libxtst-dev \ + m4 \ + mercurial \ + nasm \ + pkg-config \ + python3 \ + python3-pip \ + unzip \ + wget + +COPY taskcluster/docker/recipes/install-node.sh /scripts/install-node.sh +RUN chmod +x /scripts/install-node.sh +RUN /scripts/install-node.sh + +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y +RUN $HOME/.cargo/bin/cargo install cbindgen + +WORKDIR /app + +CMD ["/bin/bash"] ===================================== .gitlab/ci/lint.yml ===================================== @@ -1,20 +1,20 @@ -variables: - # This needs to be kept in sync with the max Python version accepted by ./mach - PYTHON_VERSION: "3.11.7" - .base: stage: lint interruptible: true variables: - PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + MOZBUILD_STATE_PATH: "$CI_PROJECT_DIR/.cache/mozbuild" cache: paths: - node_modules - - .cache/pip + - .cache/mozbuild + # Store the cache regardless on job outcome + when: 'always' + # Share the cache throughout all pipelines running for a given branch + key: $CI_COMMIT_REF_SLUG eslint: extends: .base - image: cimg/python:$PYTHON_VERSION-node + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py eslint rules: @@ -45,7 +45,7 @@ eslint: stylelint: extends: .base - image: cimg/python:$PYTHON_VERSION-node + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py stylelint rules: @@ -65,7 +65,7 @@ stylelint: py-black: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py black rules: @@ -86,7 +86,7 @@ py-black: py-ruff: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py ruff rules: @@ -107,7 +107,7 @@ py-ruff: yaml: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py yaml rules: @@ -124,7 +124,7 @@ yaml: shellcheck: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py shellcheck rules: @@ -140,8 +140,9 @@ shellcheck: clang-format: extends: .base - image: cimg/python:$PYTHON_VERSION + 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 rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' @@ -161,7 +162,7 @@ clang-format: rustfmt: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py rustfmt rules: @@ -177,7 +178,7 @@ rustfmt: fluent-lint: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py fluent-lint rules: @@ -194,7 +195,7 @@ fluent-lint: localization: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py l10n rules: @@ -213,7 +214,7 @@ localization: mingw-capitalization: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py mingw-capitalization rules: @@ -232,7 +233,7 @@ mingw-capitalization: mscom-init: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py mscom-init rules: @@ -251,7 +252,7 @@ mscom-init: file-whitespace: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py file-whitespace rules: @@ -282,7 +283,7 @@ file-whitespace: test-manifest: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py test-manifest-alpha test-manifest-disable test-manifest-skip-if rules: @@ -299,7 +300,7 @@ test-manifest: trojan-source: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py trojan-source rules: ===================================== .gitlab/ci/scripts/run_linters.py ===================================== @@ -54,7 +54,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 in branch '{branch_name}'." + f"Failed to find reference specifier for Firefox tag '{tag}' in branch '{branch_name}'." ) @@ -98,13 +98,13 @@ if __name__ == "__main__": ) args = parser.parse_args() - command = [ - "./mach", - "lint", - "-v", - *(s for l in args.linters for s in ("-l", l)), - *get_list_of_changed_files(), - ] - result = subprocess.run(command, text=True) - - sys.exit(result.returncode) + 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) + else: + print("No files changed, skipping linting.") View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/da… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/da… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.0esr-14.0-1] 2 commits: fixup! Add CI for Base Browser
by Pier Angelo Vendrame (＠pierov) 18 Jul '24

18 Jul '24

Pier Angelo Vendrame pushed to branch base-browser-128.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: ac54df57 by Beatriz Rizental at 2024-07-18T11:34:23+02:00 fixup! Add CI for Base Browser Bug 42722: Use custom Dockerfile for lint CI jobs to address missing dependencies issues with clang-format and l10n linters. - - - - - fa88a433 by Beatriz Rizental at 2024-07-18T11:34:24+02:00 fixup! Add CI for Base Browser Bug 42722: Cache mozbuild path instead of specifically the pip path - - - - - 4 changed files: - .gitlab-ci.yml - + .gitlab/ci/docker/base/Dockerfile - .gitlab/ci/lint.yml - .gitlab/ci/scripts/run_linters.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -1,5 +1,8 @@ stages: - lint +variables: + IMAGE_PATH: containers.torproject.org/tpo/applications/tor-browser/base:latest + include: - local: '.gitlab/ci/lint.yml' ===================================== .gitlab/ci/docker/base/Dockerfile ===================================== @@ -0,0 +1,69 @@ +FROM debian:latest + +# Base image which includes all* dependencies checked by ./mach configure. +# +# * Actually not all dependencies. WASM sandboxed depencies were left out for now. +# This installs all dependencies checked by `./mach configure --without-wasm-sandboxed-libraries`. +# +# # Building and publishing +# +# Whenever this file changes, the updated Docker image must be built and published _manually_ to +# the tor-browser container registry (https://gitlab.torproject.org/tpo/applications/tor-browser/container_regist…) +# +# This image copies a script from the taskcluster/ folder, which requires it +# to be built from a folder which is a parent of the taskcluster/ folder. +# +# To build, run: +# +# ```bash +# docker build \ +# -f <PATH_TO_DOCKERFILE> \ +# -t <REGISTRY_URL>/<IMAGE_NAME>:<IMAGE_TAG> +# . +# ``` +# +# For example, when building from the root of this repository to the main tor-browser repository +# and assuming image name to be "base" and tag "latest" -- which is the current terminology: +# +# ```bash +# docker build \ +# -f .gitlab/ci/docker/Dockerfile \ +# -t containers.torproject.org/tpo/applications/tor-browser/base:latest +# . +# ``` + +RUN apt-get update && apt-get install -y \ + clang \ + curl \ + git \ + libasound2-dev \ + libdbus-glib-1-dev \ + libgtk-3-dev \ + libpango1.0-dev \ + libpulse-dev \ + libx11-xcb-dev \ + libxcomposite-dev \ + libxcursor-dev \ + libxdamage-dev \ + libxi-dev \ + libxrandr-dev \ + libxtst-dev \ + m4 \ + mercurial \ + nasm \ + pkg-config \ + python3 \ + python3-pip \ + unzip \ + wget + +COPY taskcluster/docker/recipes/install-node.sh /scripts/install-node.sh +RUN chmod +x /scripts/install-node.sh +RUN /scripts/install-node.sh + +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y +RUN $HOME/.cargo/bin/cargo install cbindgen + +WORKDIR /app + +CMD ["/bin/bash"] ===================================== .gitlab/ci/lint.yml ===================================== @@ -1,20 +1,20 @@ -variables: - # This needs to be kept in sync with the max Python version accepted by ./mach - PYTHON_VERSION: "3.11.7" - .base: stage: lint interruptible: true variables: - PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + MOZBUILD_STATE_PATH: "$CI_PROJECT_DIR/.cache/mozbuild" cache: paths: - node_modules - - .cache/pip + - .cache/mozbuild + # Store the cache regardless on job outcome + when: 'always' + # Share the cache throughout all pipelines running for a given branch + key: $CI_COMMIT_REF_SLUG eslint: extends: .base - image: cimg/python:$PYTHON_VERSION-node + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py eslint rules: @@ -45,7 +45,7 @@ eslint: stylelint: extends: .base - image: cimg/python:$PYTHON_VERSION-node + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py stylelint rules: @@ -65,7 +65,7 @@ stylelint: py-black: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py black rules: @@ -86,7 +86,7 @@ py-black: py-ruff: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py ruff rules: @@ -107,7 +107,7 @@ py-ruff: yaml: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py yaml rules: @@ -124,7 +124,7 @@ yaml: shellcheck: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py shellcheck rules: @@ -140,8 +140,9 @@ shellcheck: clang-format: extends: .base - image: cimg/python:$PYTHON_VERSION + 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 rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' @@ -161,7 +162,7 @@ clang-format: rustfmt: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py rustfmt rules: @@ -177,7 +178,7 @@ rustfmt: fluent-lint: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py fluent-lint rules: @@ -194,7 +195,7 @@ fluent-lint: localization: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py l10n rules: @@ -213,7 +214,7 @@ localization: mingw-capitalization: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py mingw-capitalization rules: @@ -232,7 +233,7 @@ mingw-capitalization: mscom-init: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py mscom-init rules: @@ -251,7 +252,7 @@ mscom-init: file-whitespace: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py file-whitespace rules: @@ -282,7 +283,7 @@ file-whitespace: test-manifest: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py test-manifest-alpha test-manifest-disable test-manifest-skip-if rules: @@ -299,7 +300,7 @@ test-manifest: trojan-source: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py trojan-source rules: ===================================== .gitlab/ci/scripts/run_linters.py ===================================== @@ -54,7 +54,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 in branch '{branch_name}'." + f"Failed to find reference specifier for Firefox tag '{tag}' in branch '{branch_name}'." ) @@ -98,13 +98,13 @@ if __name__ == "__main__": ) args = parser.parse_args() - command = [ - "./mach", - "lint", - "-v", - *(s for l in args.linters for s in ("-l", l)), - *get_list_of_changed_files(), - ] - result = subprocess.run(command, text=True) - - sys.exit(result.returncode) + 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) + else: + print("No files changed, skipping linting.") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/1f329b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/1f329b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-128.0esr-14.0-1-build1
by Pier Angelo Vendrame (＠pierov) 18 Jul '24

18 Jul '24

Pier Angelo Vendrame pushed new tag mullvad-browser-128.0esr-14.0-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.0esr-14.0-1] 2 commits: fixup! Add CI for Base Browser
by Pier Angelo Vendrame (＠pierov) 18 Jul '24

18 Jul '24

Pier Angelo Vendrame pushed to branch tor-browser-128.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: a274adca by Beatriz Rizental at 2024-07-18T09:17:07+00:00 fixup! Add CI for Base Browser Bug 42722: Use custom Dockerfile for lint CI jobs to address missing dependencies issues with clang-format and l10n linters. - - - - - 83fef5d0 by Beatriz Rizental at 2024-07-18T09:17:07+00:00 fixup! Add CI for Base Browser Bug 42722: Cache mozbuild path instead of specifically the pip path - - - - - 4 changed files: - .gitlab-ci.yml - + .gitlab/ci/docker/base/Dockerfile - .gitlab/ci/lint.yml - .gitlab/ci/scripts/run_linters.py Changes: ===================================== .gitlab-ci.yml ===================================== @@ -2,6 +2,9 @@ stages: - lint - update-translations +variables: + IMAGE_PATH: containers.torproject.org/tpo/applications/tor-browser/base:latest + include: - local: '.gitlab/ci/lint.yml' - local: '.gitlab/ci/update-translations.yml' ===================================== .gitlab/ci/docker/base/Dockerfile ===================================== @@ -0,0 +1,69 @@ +FROM debian:latest + +# Base image which includes all* dependencies checked by ./mach configure. +# +# * Actually not all dependencies. WASM sandboxed depencies were left out for now. +# This installs all dependencies checked by `./mach configure --without-wasm-sandboxed-libraries`. +# +# # Building and publishing +# +# Whenever this file changes, the updated Docker image must be built and published _manually_ to +# the tor-browser container registry (https://gitlab.torproject.org/tpo/applications/tor-browser/container_regist…) +# +# This image copies a script from the taskcluster/ folder, which requires it +# to be built from a folder which is a parent of the taskcluster/ folder. +# +# To build, run: +# +# ```bash +# docker build \ +# -f <PATH_TO_DOCKERFILE> \ +# -t <REGISTRY_URL>/<IMAGE_NAME>:<IMAGE_TAG> +# . +# ``` +# +# For example, when building from the root of this repository to the main tor-browser repository +# and assuming image name to be "base" and tag "latest" -- which is the current terminology: +# +# ```bash +# docker build \ +# -f .gitlab/ci/docker/Dockerfile \ +# -t containers.torproject.org/tpo/applications/tor-browser/base:latest +# . +# ``` + +RUN apt-get update && apt-get install -y \ + clang \ + curl \ + git \ + libasound2-dev \ + libdbus-glib-1-dev \ + libgtk-3-dev \ + libpango1.0-dev \ + libpulse-dev \ + libx11-xcb-dev \ + libxcomposite-dev \ + libxcursor-dev \ + libxdamage-dev \ + libxi-dev \ + libxrandr-dev \ + libxtst-dev \ + m4 \ + mercurial \ + nasm \ + pkg-config \ + python3 \ + python3-pip \ + unzip \ + wget + +COPY taskcluster/docker/recipes/install-node.sh /scripts/install-node.sh +RUN chmod +x /scripts/install-node.sh +RUN /scripts/install-node.sh + +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y +RUN $HOME/.cargo/bin/cargo install cbindgen + +WORKDIR /app + +CMD ["/bin/bash"] ===================================== .gitlab/ci/lint.yml ===================================== @@ -1,20 +1,20 @@ -variables: - # This needs to be kept in sync with the max Python version accepted by ./mach - PYTHON_VERSION: "3.11.7" - .base: stage: lint interruptible: true variables: - PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" + MOZBUILD_STATE_PATH: "$CI_PROJECT_DIR/.cache/mozbuild" cache: paths: - node_modules - - .cache/pip + - .cache/mozbuild + # Store the cache regardless on job outcome + when: 'always' + # Share the cache throughout all pipelines running for a given branch + key: $CI_COMMIT_REF_SLUG eslint: extends: .base - image: cimg/python:$PYTHON_VERSION-node + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py eslint rules: @@ -45,7 +45,7 @@ eslint: stylelint: extends: .base - image: cimg/python:$PYTHON_VERSION-node + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py stylelint rules: @@ -65,7 +65,7 @@ stylelint: py-black: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py black rules: @@ -86,7 +86,7 @@ py-black: py-ruff: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py ruff rules: @@ -107,7 +107,7 @@ py-ruff: yaml: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py yaml rules: @@ -124,7 +124,7 @@ yaml: shellcheck: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py shellcheck rules: @@ -140,8 +140,9 @@ shellcheck: clang-format: extends: .base - image: cimg/python:$PYTHON_VERSION + 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 rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' @@ -161,7 +162,7 @@ clang-format: rustfmt: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py rustfmt rules: @@ -177,7 +178,7 @@ rustfmt: fluent-lint: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py fluent-lint rules: @@ -194,7 +195,7 @@ fluent-lint: localization: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py l10n rules: @@ -213,7 +214,7 @@ localization: mingw-capitalization: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py mingw-capitalization rules: @@ -232,7 +233,7 @@ mingw-capitalization: mscom-init: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py mscom-init rules: @@ -251,7 +252,7 @@ mscom-init: file-whitespace: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py file-whitespace rules: @@ -282,7 +283,7 @@ file-whitespace: test-manifest: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py test-manifest-alpha test-manifest-disable test-manifest-skip-if rules: @@ -299,7 +300,7 @@ test-manifest: trojan-source: extends: .base - image: cimg/python:$PYTHON_VERSION + image: $IMAGE_PATH script: - .gitlab/ci/scripts/run_linters.py trojan-source rules: ===================================== .gitlab/ci/scripts/run_linters.py ===================================== @@ -54,7 +54,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 in branch '{branch_name}'." + f"Failed to find reference specifier for Firefox tag '{tag}' in branch '{branch_name}'." ) @@ -98,13 +98,13 @@ if __name__ == "__main__": ) args = parser.parse_args() - command = [ - "./mach", - "lint", - "-v", - *(s for l in args.linters for s in ("-l", l)), - *get_list_of_changed_files(), - ] - result = subprocess.run(command, text=True) - - sys.exit(result.returncode) + 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) + else: + print("No files changed, skipping linting.") View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8c9bb1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8c9bb1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.0esr-14.0-1] 20 commits: MB 38: Mullvad Browser configuration
by richard (＠richard) 17 Jul '24

17 Jul '24

richard pushed to branch mullvad-browser-128.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 18bff166 by Pier Angelo Vendrame at 2024-07-17T21:41:02+00:00 MB 38: Mullvad Browser configuration - - - - - a8bc0bdb by Pier Angelo Vendrame at 2024-07-17T21:41:02+00:00 MB 1: Mullvad Browser branding See also: mullvad-browser#5: Product name and directory customization mullvad-browser#12: Create new branding directories and integrate Mullvad icons+branding mullvad-browser#14: Remove Default Built-in bookmarks mullvad-browser#35: Add custom PDF icons for Windows builds mullvad-browser#48: Replace Mozilla copyright and legal trademarks in mullvadbrowser.exe metadata mullvad-browser#51: Update trademark string mullvad-browser#104: Update shipped dll metadata copyright/licensing info mullvad-browser#107: Add alpha and nightly icons - - - - - fec7d5ba by Pier Angelo Vendrame at 2024-07-17T21:41:02+00:00 MB 20: Allow packaged-addons in PBM. We install a few addons from the distribution directory, but they are not automatically enabled for PBM mode. This commit modifies the code that installs them to also add the PBM permission to the known ones. - - - - - 577e427b by Pier Angelo Vendrame at 2024-07-17T21:41:02+00:00 MB 63: Customize some about pages for Mullvad Browser Also: mullvad-browser#57: Purge unneeded about: pages - - - - - 8daf8f46 by Pier Angelo Vendrame at 2024-07-17T21:41:02+00:00 MB 37: Customization for the about dialog - - - - - e225a7c9 by Henry Wilkes at 2024-07-17T21:41:02+00:00 MB 39: Add home page about:mullvad-browser - - - - - 9c2f86d9 by hackademix at 2024-07-17T21:41:02+00:00 MB 97: Remove UI cues to install new extensions. - - - - - b4e3f3a3 by hackademix at 2024-07-17T21:41:02+00:00 MB 47: uBlock Origin customization - - - - - e10ea086 by Pier Angelo Vendrame at 2024-07-17T21:41:02+00:00 MB 21: Disable the password manager This commit disables the about:login page and removes the "Login and Password" section of about:preferences. We do not do anything to the real password manager of Firefox, that is in toolkit: it contains C++ parts that make it difficult to actually prevent it from being built.. Finally, we modify the the function that opens about:login to report an error in the console so that we can quickly get a backtrace to the code that tries to use it. - - - - - 76e0f3c8 by Pier Angelo Vendrame at 2024-07-17T21:41:02+00:00 MB 112: Updater customization for Mullvad Browser MB 71: Set the updater base URL to Mullvad domain - - - - - 6ae50ff0 by Nicolas Vigier at 2024-07-17T21:41:02+00:00 MB 79: Add Mullvad Browser MAR signing keys MB 256: Add mullvad-browser nightly mar signing key - - - - - bc7ec699 by Pier Angelo Vendrame at 2024-07-17T21:41:02+00:00 MB 34: Hide unsafe and unwanted preferences UI about:preferences allow to override some of our defaults, that could be fingeprintable or have some other unwanted consequences. - - - - - 9520850f by Pier Angelo Vendrame at 2024-07-17T21:41:02+00:00 MB 160: Disable the cookie exceptions button Besides disabling the "Delete on close checkbox", disable also the "Manage Exceptions" button when always using PBM. - - - - - 164a5e2a by hackademix at 2024-07-17T21:41:02+00:00 MB 163: prevent uBlock Origin from being uninstalled/disabled - - - - - b759fade by Richard Pospesel at 2024-07-17T21:41:02+00:00 MB 188: Customize Gitlab Issue and Merge templates - - - - - 4d741ece by rui hildt at 2024-07-17T21:41:02+00:00 MB 213: Customize the search engines list - - - - - 72122082 by hackademix at 2024-07-17T21:41:02+00:00 MB 214: Enable cross-tab identity leak protection in "quiet" mode - - - - - 4a9de78e by Pier Angelo Vendrame at 2024-07-17T21:41:02+00:00 MB 234: Disable OS spoofing in HTTP User-Agent. This commits makes it possible to disable OS spoofing in the HTTP User-Agent header, to see if matching header and JS property improve usability. - - - - - 497b26dd by Pier Angelo Vendrame at 2024-07-17T21:41:02+00:00 MB 80: Enable Mullvad Browser as a default browser - - - - - da57ab5f by Pier Angelo Vendrame at 2024-07-17T21:41:02+00:00 fixup! MB 213: Customize the search engines list Update the search engine customization to be compatible with the new config mechanisms. - - - - - 30 changed files: - .gitlab/issue_templates/Emergency Security Issue.md - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/default.md - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/module.ver - browser/app/firefox.exe.manifest → browser/app/mullvadbrowser.exe.manifest - + browser/app/profile/000-mullvad-browser.js - browser/app/profile/001-base-profile.js - browser/base/content/aboutDialog.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-places.js - browser/base/content/browser.js - browser/base/content/default-bookmarks.html - browser/base/content/nsContextMenu.js - browser/base/content/overrides/app-license.html - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/utilityOverlay.js - browser/branding/branding-common.mozbuild - + browser/branding/mb-alpha/VisualElements_150.png - + browser/branding/mb-alpha/VisualElements_70.png - + browser/branding/mb-alpha/configure.sh - + browser/branding/mb-alpha/content/about-logo.png - + browser/branding/mb-alpha/content/about-logo.svg - + browser/branding/mb-alpha/content/about-logo(a)2x.png - + browser/branding/mb-alpha/content/about-wordmark.svg - + browser/branding/mb-alpha/content/about.png - + browser/branding/mb-alpha/content/aboutDialog.css The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/1f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/1f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.0esr-14.0-1] Bug 29320: Replace the gnu target with gnullvm for Rust.
by Pier Angelo Vendrame (＠pierov) 17 Jul '24

17 Jul '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 1f329b97 by Pier Angelo Vendrame at 2024-07-17T18:52:17+02:00 Bug 29320: Replace the gnu target with gnullvm for Rust. - - - - - 2 changed files: - build/moz.configure/init.configure - build/moz.configure/rust.configure Changes: ===================================== build/moz.configure/init.configure ===================================== @@ -510,12 +510,16 @@ def split_triplet(triplet, allow_wasi=False): canonical_kernel = "kFreeBSD" elif os.startswith("gnu"): canonical_os = canonical_kernel = "GNU" - elif os.startswith("mingw") or os in ("windows-msvc", "windows-gnu"): + elif os.startswith("mingw") or os in ( + "windows-msvc", + "windows-gnu", + "windows-gnullvm", + ): canonical_os = canonical_kernel = "WINNT" if not os.startswith("mingw"): if os == "windows-msvc": abi = "msvc" - elif os == "windows-gnu": + elif os == "windows-gnu" or os == "windows-gnullvm": abi = "mingw" # Many things down the line are looking for the string "mingw32" # until they are all fixed, we pretend that's the raw os we had ===================================== build/moz.configure/rust.configure ===================================== @@ -310,9 +310,9 @@ def detect_rustc_target( if host_or_target.abi == "msvc": suffix = "windows-msvc" elif host_or_target.abi == "mingw": - suffix = "windows-gnu" + suffix = "windows-gnullvm" elif compiler_info.type in ("gcc", "clang"): - suffix = "windows-gnu" + suffix = "windows-gnullvm" else: suffix = "windows-msvc" narrowed = [ View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/1f3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/1f3… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.0esr-14.0-1] Bug 29320: Replace the gnu target with gnullvm for Rust.
by Pier Angelo Vendrame (＠pierov) 17 Jul '24

17 Jul '24

Pier Angelo Vendrame pushed to branch base-browser-128.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 1f329b97 by Pier Angelo Vendrame at 2024-07-17T18:52:17+02:00 Bug 29320: Replace the gnu target with gnullvm for Rust. - - - - - 2 changed files: - build/moz.configure/init.configure - build/moz.configure/rust.configure Changes: ===================================== build/moz.configure/init.configure ===================================== @@ -510,12 +510,16 @@ def split_triplet(triplet, allow_wasi=False): canonical_kernel = "kFreeBSD" elif os.startswith("gnu"): canonical_os = canonical_kernel = "GNU" - elif os.startswith("mingw") or os in ("windows-msvc", "windows-gnu"): + elif os.startswith("mingw") or os in ( + "windows-msvc", + "windows-gnu", + "windows-gnullvm", + ): canonical_os = canonical_kernel = "WINNT" if not os.startswith("mingw"): if os == "windows-msvc": abi = "msvc" - elif os == "windows-gnu": + elif os == "windows-gnu" or os == "windows-gnullvm": abi = "mingw" # Many things down the line are looking for the string "mingw32" # until they are all fixed, we pretend that's the raw os we had ===================================== build/moz.configure/rust.configure ===================================== @@ -310,9 +310,9 @@ def detect_rustc_target( if host_or_target.abi == "msvc": suffix = "windows-msvc" elif host_or_target.abi == "mingw": - suffix = "windows-gnu" + suffix = "windows-gnullvm" elif compiler_info.type in ("gcc", "clang"): - suffix = "windows-gnu" + suffix = "windows-gnullvm" else: suffix = "windows-msvc" narrowed = [ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1f329b9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1f329b9… You're receiving this email because of your account on gitlab.torproject.org.

1 0