brizental pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser
Commits:
-
1bc6d674
by Beatriz Rizental at 2025-08-28T13:32:32+02:00
-
acb60482
by Beatriz Rizental at 2025-08-28T13:32:32+02:00
3 changed files:
- .gitlab/ci/containers/base/Containerfile
- .gitlab/ci/jobs/lint/lint.yml
- .gitlab/ci/jobs/update-containers.yml
Changes:
| ... | ... | @@ -5,42 +5,19 @@ |
| 5 | 5 | #
|
| 6 | 6 | # The image is updated roughly once a month when the tor-browser repository is rebased.
|
| 7 | 7 | |
| 8 | -FROM containers.torproject.org/tpo/tpa/base-images/python:bookworm
|
|
| 8 | +FROM containers.torproject.org/tpo/tpa/base-images/python:trixie
|
|
| 9 | 9 | |
| 10 | 10 | RUN apt-get update && apt-get install -y \
|
| 11 | - clang \
|
|
| 12 | - clang-tidy \
|
|
| 13 | - curl \
|
|
| 14 | 11 | git \
|
| 15 | - libasound2-dev \
|
|
| 16 | - libdbus-glib-1-dev \
|
|
| 17 | - libgtk-3-dev \
|
|
| 18 | - libpango1.0-dev \
|
|
| 19 | - libpulse-dev \
|
|
| 20 | - libx11-xcb-dev \
|
|
| 21 | - libxcomposite-dev \
|
|
| 22 | - libxcursor-dev \
|
|
| 23 | - libxdamage-dev \
|
|
| 24 | - libxi-dev \
|
|
| 25 | - libxrandr-dev \
|
|
| 26 | - libxtst-dev \
|
|
| 27 | - make \
|
|
| 28 | - m4 \
|
|
| 29 | - mercurial \
|
|
| 30 | - nasm \
|
|
| 31 | - pkgconf \
|
|
| 32 | - unzip \
|
|
| 33 | - x11-utils \
|
|
| 34 | - xvfb \
|
|
| 35 | - xz-utils \
|
|
| 36 | - wget
|
|
| 12 | + xvfb
|
|
| 37 | 13 | |
| 38 | -RUN curl -fsSL https://deb.nodesource.com/setup_lts.x -o nodesource_setup.sh && \
|
|
| 39 | - bash nodesource_setup.sh && \
|
|
| 40 | - apt-get install -y nodejs
|
|
| 14 | +RUN git clone --single-branch --depth 1 https://gitlab.torproject.org/tpo/applications/tor-browser.git
|
|
| 41 | 15 | |
| 42 | -RUN apt-get clean && \
|
|
| 43 | - rm -rf /var/lib/apt/lists/*
|
|
| 16 | +# Bootstrap will download and install all dependencies required for building / linting / etc.
|
|
| 17 | +RUN cd tor-browser && \
|
|
| 18 | + yes | MOZBUILD_STATE_PATH=/var/tmp/mozbuild ./mach bootstrap --application-choice "Tor Browser for Desktop" && \
|
|
| 19 | + cd ..
|
|
| 44 | 20 | |
| 45 | -RUN curl https://sh.rustup.rs -sSf | sh -s -- -y && \
|
|
| 46 | - $HOME/.cargo/bin/cargo install cbindgen |
|
| 21 | +RUN rm -rf tor-browser && \
|
|
| 22 | + apt-get clean && \
|
|
| 23 | + rm -rf /var/lib/apt/lists/* |
| ... | ... | @@ -4,11 +4,11 @@ lint-all: |
| 4 | 4 | image: $IMAGE_PATH
|
| 5 | 5 | interruptible: true
|
| 6 | 6 | variables:
|
| 7 | - MOZBUILD_STATE_PATH: "$CI_PROJECT_DIR/.cache/mozbuild"
|
|
| 7 | + # Has to be the same as defined in `containers/base/Containerfile`
|
|
| 8 | + MOZBUILD_STATE_PATH: "/var/tmp/mozbuild"
|
|
| 8 | 9 | cache:
|
| 9 | 10 | paths:
|
| 10 | 11 | - node_modules
|
| 11 | - - .cache/mozbuild
|
|
| 12 | 12 | # Store the cache regardless on job outcome
|
| 13 | 13 | when: 'always'
|
| 14 | 14 | # Share the cache throughout all pipelines running for a given branch
|
| ... | ... | @@ -17,7 +17,7 @@ lint-all: |
| 17 | 17 | # Run these jobs in the browser dedicated runners.
|
| 18 | 18 | - firefox
|
| 19 | 19 | script:
|
| 20 | - - ./mach configure --without-wasm-sandboxed-libraries --with-base-browser-version=0.0.0
|
|
| 20 | + - ./mach configure --with-base-browser-version=0.0.0
|
|
| 21 | 21 | - .gitlab/ci/jobs/lint/helpers.py --get-changed-files | xargs -0 --no-run-if-empty ./mach lint -v
|
| 22 | 22 | rules:
|
| 23 | 23 | - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
|
| ... | ... | @@ -10,7 +10,7 @@ build-base-image: |
| 10 | 10 | echo -e "\e[33mPushing new image to registry as ${TAG}\e[0m"
|
| 11 | 11 | podman push ${TAG}
|
| 12 | 12 | rules:
|
| 13 | - - if: ($CI_COMMIT_BRANCH && $CI_COMMIT_REF_PROTECTED == 'true' && $CI_PROJECT_NAMESPACE == 'tpo/applications' && $CI_PIPELINE_SOURCE == 'push')
|
|
| 13 | + - if: ($CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_NAMESPACE == 'tpo/applications')
|
|
| 14 | 14 | changes:
|
| 15 | 15 | - '.gitlab/ci/containers/base/Containerfile'
|
| 16 | 16 | - '.gitlab-ci.yml' |