- tbb-commits - lists.torproject.org

[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

[Git][tpo/applications/tor-browser][tor-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 tor-browser-128.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 8c9bb13d by Pier Angelo Vendrame at 2024-07-16T10:14:30+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/8c9bb13… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8c9bb13… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-bundle-testsuite][main] Bug 40078: Update tools/tb-build-06-start-nightly-build to archive binaries...
by boklm (＠boklm) 17 Jul '24

17 Jul '24

boklm pushed to branch main at The Tor Project / Applications / tor-browser-bundle-testsuite Commits: b83c519e by Richard Pospesel at 2024-07-10T21:18:46+00:00 Bug 40078: Update tools/tb-build-06-start-nightly-build to archive binaries after tor-browser-build#40829 - - - - - 1 changed file: - tools/tb-build-06-start-nightly-build Changes: ===================================== tools/tb-build-06-start-nightly-build ===================================== @@ -41,13 +41,14 @@ then find "$dir" -maxdepth 1 $ \ -name '*.txt' \ -o -name '*.asc' \ - -o -name 'torbrowser-install-*_ALL.exe' \ - -o -name 'TorBrowser-*_ALL.dmg' \ - -o -name 'tor-browser-linux*_ALL.tar.xz' \ - -o -name '*-multi-qa.apk' \ - -o -name 'basebrowser-install-*_ALL.exe' \ - -o -name 'BaseBrowser-*_ALL.dmg' \ - -o -name 'base-browser-linux*_ALL.tar.xz' \ + -o -name '*-browser-windows*.exe' \ + -o -name '*-browser-macos*.dmg' \ + -o -name '*-browser-linux*.tar.xz' \ + -o -name '*-browser*.deb' \ + -o -name '*-browser*.rpm' \ + -o -name '*-browser*.apk' \ + -o -name '*-browser-debug-symbols-*.tar.xz' \ + -o -name 'tor-expert-bundle*.tar.gz' \ $ \ -a -execdir cp -a {} "$dname" \; done View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 19 commits: Bug 41156: Remove redundancy in Rust config options.
by Pier Angelo Vendrame (＠pierov) 17 Jul '24

17 Jul '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 5ba04970 by Pier Angelo Vendrame at 2024-07-16T10:57:00+02:00 Bug 41156: Remove redundancy in Rust config options. configure_opt has been renamed to target_flags to avoid confusion with the the flags usually passed to configure scripts generated from autoconf. - - - - - 9999a1ac by Pier Angelo Vendrame at 2024-07-16T10:57:01+02:00 Bug 41155: Update taskcluster paths. Mozilla moved the YAML files in which they define their toolchain. Also, updated how we check Rust's version. - - - - - af71b2e4 by Pier Angelo Vendrame at 2024-07-16T10:57:02+02:00 Bug 41155: Update the tools to extract the macOS SDK. Updated the tools from Firefox 128. - - - - - 00703548 by Pier Angelo Vendrame at 2024-07-16T10:57:02+02:00 Bug 41155: Update desktop dependencies for Firefox 128. - - - - - cf99dfac by Pier Angelo Vendrame at 2024-07-16T10:57:02+02:00 Bug 29320: Use the LLVM toolchain to build Rust for Windows. - - - - - e9be9689 by Pier Angelo Vendrame at 2024-07-16T10:57:02+02:00 Bug 29318: Drop the GCC mingw toolchain. - - - - - 1c933bd8 by Pier Angelo Vendrame at 2024-07-16T10:57:02+02:00 Bug 41155: Add a project for windows-rs. - - - - - 38b2ea47 by Pier Angelo Vendrame at 2024-07-16T10:57:02+02:00 Bug 41155: Updated the Firefox project for 128. - - - - - 299bb7bb by Pier Angelo Vendrame at 2024-07-16T10:57:02+02:00 Bug 41171: Switch Android containers to Debian bookworm. This involves replacing all references to OpenJDK 11 with OpenJDK 17. - - - - - c3444c4c by Pier Angelo Vendrame at 2024-07-16T10:57:02+02:00 Bug 41172: Refactor the android-toolchain project. In the android-toolchain project we used to add many versions of the tools we do not actually need. Also, since we are not building anything, but just extracting archives, we can run the build outside containers. - - - - - 3b685fab by Pier Angelo Vendrame at 2024-07-16T10:57:02+02:00 Bug 41155: Set minimum API level to 21 for all Android architectures. Google dropped support for KitKat in the Play Store. So, the minimum API level supported by the NDK and by Firefox is 21. - - - - - c6ddd22a by Pier Angelo Vendrame at 2024-07-17T14:18:19+02:00 Bug 41155: Update toolchains for ESR128 (Android) - - - - - 9abf39ee by Pier Angelo Vendrame at 2024-07-17T14:18:26+02:00 Bug 41155: Update application-services to 128. - - - - - 5405c943 by Pier Angelo Vendrame at 2024-07-17T14:18:26+02:00 Bug 41123: Move firefox-android inside geckoview. The steps to build Fenix after the migration to the monorepo are very similar to the ones we used to build it from the previous repository. However, they need to be run on the tor-browser.git repository, so in this commit we move part of the firefox-android project to the merge_aars phase of GeckoView. - - - - - 070bc3fd by Pier Angelo Vendrame at 2024-07-17T14:18:26+02:00 Bug 41123: Rename GeckoView's merge_aars step to build_apk. - - - - - 1b574d24 by Pier Angelo Vendrame at 2024-07-17T14:18:26+02:00 Bug 41123: Use GeckoView apks in browser. Now the APKs are produced in the GeckoView project, rather than firefox-android. - - - - - 3118df78 by Pier Angelo Vendrame at 2024-07-17T14:18:26+02:00 Bug 41178: Disable IPv6 in fix_gradle_deps.py. Our build servers cannot reach maven.mozilla.org through IPv6. With this commit, we switch to requests (we have it anyway, since we use it to build changelogs), which downloads dependencies on memory first, but usually dependencies are small and you need a giant amount of memory to build Java stuff anyway. - - - - - a571c1aa by Pier Angelo Vendrame at 2024-07-17T14:18:26+02:00 Bug 41155: Bump Firefox version to 128. - - - - - 29a472cc by NoisyCoil at 2024-07-17T14:18:26+02:00 Bug 41155: Do not strip binaries again when packaging debs. Our binaries are already stripped, so avoid stripping them again when creating Debian packages, as the version of binutils in our containers cannot understand some ELF sections of the new binaries generated after the Firefox+toolchain update. - - - - - 5 changed files: - projects/android-toolchain/build - projects/android-toolchain/config - projects/application-services/bug40485.diff - projects/application-services/build - projects/application-services/config The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0