brizental pushed to branch tor-browser-151.0a1-16.0-1 at The Tor Project / Applications / Tor Browser
Commits:
-
67ead9ef
by Beatriz Rizental at 2026-05-27T12:11:12-03:00
-
80fcd6c6
by Beatriz Rizental at 2026-05-27T12:11:13-03:00
-
1d1ea9c7
by Beatriz Rizental at 2026-05-27T12:11:14-03:00
-
2efc5699
by Beatriz Rizental at 2026-05-27T12:11:15-03:00
3 changed files:
- .gitlab/ci/containers/base/Containerfile
- .gitlab/ci/jobs/update-containers.yml
- .gitlab/ci/mixins.yml
Changes:
| ... | ... | @@ -22,18 +22,27 @@ RUN cd tor-browser && \ |
| 22 | 22 | yes | MOZBUILD_STATE_PATH=/var/tmp/mozbuild ./mach bootstrap --application-choice "$APPLICATION_CHOICE" && \
|
| 23 | 23 | cd ..
|
| 24 | 24 | |
| 25 | -ENV PATH="/var/tmp/mozbuild/clang/bin:/root/.cargo/bin:$PATH"
|
|
| 25 | +RUN rm -rf tor-browser && \
|
|
| 26 | + rm -rf /var/lib/apt/lists/* && \
|
|
| 27 | + apt-get clean && \
|
|
| 28 | + rm -rf /var/tmp/mozbuild/toolchains && \
|
|
| 29 | + rm -rf /var/tmp/mozbuild/indices && \
|
|
| 30 | + rm -rf /var/tmp/mozbuild/android-device && \
|
|
| 31 | + rm -rf /var/root/.cargo && \
|
|
| 32 | + rm -rf /var/root/.rustup
|
|
| 33 | + |
|
| 34 | +RUN adduser --uid 1000 --disabled-password --gecos "" gitlab-runner && \
|
|
| 35 | + chown -R 1000:1000 /var/tmp/mozbuild/
|
|
| 36 | + |
|
| 37 | +USER gitlab-runner
|
|
| 38 | +WORKDIR /home/gitlab-runner
|
|
| 26 | 39 | |
| 40 | +# Install Rust for the gitlab-runner user.
|
|
| 41 | +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
|
|
| 42 | +ENV PATH="/var/tmp/mozbuild/clang/bin:/home/gitlab-runner/.cargo/bin:$PATH"
|
|
| 27 | 43 | RUN echo "$APPLICATION_CHOICE" | grep -qi android && \
|
| 28 | 44 | rustup target add armv7-linux-androideabi \
|
| 29 | 45 | aarch64-linux-android \
|
| 30 | 46 | i686-linux-android \
|
| 31 | 47 | x86_64-linux-android \
|
| 32 | 48 | || true |
| 33 | - |
|
| 34 | -RUN rm -rf tor-browser && \
|
|
| 35 | - apt-get clean && \
|
|
| 36 | - rm -rf /var/lib/apt/lists/* && \
|
|
| 37 | - rm -rf /var/tmp/mozbuild/toolchains && \
|
|
| 38 | - rm -rf /var/tmp/mozbuild/indices && \
|
|
| 39 | - rm -rf /var/tmp/mozbuild/android-device |
| 1 | 1 | build-image:
|
| 2 | 2 | stage: update-container-images
|
| 3 | 3 | interruptible: true
|
| 4 | - image: containers.torproject.org/tpo/tpa/base-images/podman:bookworm
|
|
| 4 | + image: containers.torproject.org/tpo/tpa/base-images/podman:trixie
|
|
| 5 | 5 | parallel:
|
| 6 | 6 | matrix:
|
| 7 | 7 | - PLATFORM: desktop
|
| ... | ... | @@ -2,7 +2,12 @@ |
| 2 | 2 | variables:
|
| 3 | 3 | GIT_STRATEGY: "none"
|
| 4 | 4 | FETCH_TIMEOUT: 180 # 3 minutes
|
| 5 | + |
|
| 6 | + GIT_CONFIG_GLOBAL: "/tmp/gitconfig"
|
|
| 5 | 7 | before_script:
|
| 8 | + - |
|
|
| 9 | + echo "[safe]" > "$GIT_CONFIG_GLOBAL"
|
|
| 10 | + echo " directory = *" >> "$GIT_CONFIG_GLOBAL"
|
|
| 6 | 11 | - git init
|
| 7 | 12 | - git remote add local "$LOCAL_REPO_PATH"
|
| 8 | 13 | - |
|
| ... | ... | @@ -47,12 +52,8 @@ |
| 47 | 52 | return $fetch_exit
|
| 48 | 53 | }
|
| 49 | 54 | |
| 50 | - if ! fetch_with_timeout origin "${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"; then
|
|
| 51 | - echo "Fetching failed for branch ${CI_COMMIT_BRANCH:-$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}."
|
|
| 52 | - echo "Attempting to fetch the merge request branch, assuming this pipeline is not running in a fork."
|
|
| 55 | + fetch_with_timeout origin "merge-requests/${CI_MERGE_REQUEST_IID}/head" || exit 1
|
|
| 53 | 56 | |
| 54 | - fetch_with_timeout origin "merge-requests/${CI_MERGE_REQUEST_IID}/head" || exit 1
|
|
| 55 | - fi
|
|
| 56 | 57 | - git checkout FETCH_HEAD
|
| 57 | 58 | |
| 58 | 59 | .with-local-repo-pwsh:
|