[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-149.0a1-16.0-2] fixup! Add CI for Tor Browser



Title: GitLab

brizental pushed to branch tor-browser-149.0a1-16.0-2 at The Tor Project / Applications / Tor Browser

Commits:

  • fbfc2288
    by Beatriz Rizental at 2026-04-16T11:40:32-03:00
    fixup! Add CI for Tor Browser
    
    Bug 44860: Add a container with Android toolchains
    

3 changed files:

Changes:

  • .gitlab-ci.yml
    ... ... @@ -6,7 +6,7 @@ stages:
    6 6
       - update-translations
    
    7 7
     
    
    8 8
     variables:
    
    9
    -  IMAGE_PATH: containers.torproject.org/tpo/applications/tor-browser/base:latest
    
    9
    +  IMAGE_PATH: containers.torproject.org/tpo/applications/tor-browser/desktop:latest
    
    10 10
       LOCAL_REPO_PATH: /srv/apps-repos/tor-browser.git
    
    11 11
     
    
    12 12
     include:
    

  • .gitlab/ci/containers/base/Containerfile
    1
    -# This image is published in containers.torproject.org/tpo/applications/tor-browser/base
    
    1
    +# This image is published in containers.torproject.org/tpo/applications/tor-browser/{android,desktop}
    
    2 2
     #
    
    3
    -# Whenever there are changes to this file,
    
    4
    -# they are autopublished on merge to the tpo/applications/tor-browser repository.
    
    5
    -#
    
    6
    -# The image is updated roughly once a month when the tor-browser repository is rebased.
    
    3
    +# This image is built and published on CI. The CI job that does this is manual,
    
    4
    +# therefore it's up to the developer or reviewer to trigger this CI job when necessary
    
    5
    +# e.g. after a RR rebase or big changes to this file.
    
    7 6
     
    
    8 7
     FROM containers.torproject.org/tpo/tpa/base-images/python:trixie
    
    9 8
     
    
    9
    +ARG APPLICATION_CHOICE
    
    10
    +
    
    10 11
     RUN apt-get update && apt-get install -y \
    
    12
    +        curl \
    
    11 13
             git \
    
    12
    -        xvfb
    
    14
    +        libc6-dev \
    
    15
    +        xvfb \
    
    16
    +        zlib1g-dev
    
    13 17
     
    
    14 18
     RUN git clone --single-branch --depth 1 https://gitlab.torproject.org/tpo/applications/tor-browser.git
    
    15 19
     
    
    16 20
     # Bootstrap will download and install all dependencies required for building / linting / etc.
    
    17 21
     RUN cd tor-browser && \
    
    18
    -    yes | MOZBUILD_STATE_PATH=/var/tmp/mozbuild ./mach bootstrap --application-choice "Tor Browser for Desktop" && \
    
    22
    +    yes | MOZBUILD_STATE_PATH=/var/tmp/mozbuild ./mach bootstrap --application-choice "$APPLICATION_CHOICE" && \
    
    19 23
         cd ..
    
    20 24
     
    
    25
    +ENV PATH="/var/tmp/mozbuild/clang/bin:/root/.cargo/bin:$PATH"
    
    26
    +
    
    27
    +RUN echo "$APPLICATION_CHOICE" | grep -qi android && \
    
    28
    +    rustup target add armv7-linux-androideabi \
    
    29
    +        aarch64-linux-android \
    
    30
    +        i686-linux-android \
    
    31
    +        x86_64-linux-android \
    
    32
    +    || true
    
    33
    +
    
    21 34
     RUN rm -rf tor-browser && \
    
    22 35
         apt-get clean && \
    
    23
    -    rm -rf /var/lib/apt/lists/*
    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

  • .gitlab/ci/jobs/update-containers.yml
    1
    -build-base-image:
    
    1
    +build-image:
    
    2 2
       stage: update-container-images
    
    3 3
       interruptible: true
    
    4 4
       image: containers.torproject.org/tpo/tpa/base-images/podman:bookworm
    
    5
    +  parallel:
    
    6
    +    matrix:
    
    7
    +      - PLATFORM: desktop
    
    8
    +        APPLICATION_CHOICE: "Tor Browser for Desktop"
    
    9
    +      - PLATFORM: android
    
    10
    +        APPLICATION_CHOICE: "GeckoView/Tor Browser for Android"
    
    5 11
       script:
    
    6
    -    - export TAG="${CI_REGISTRY_IMAGE}/base:latest"
    
    12
    +    - export TAG="${CI_REGISTRY_IMAGE}/${PLATFORM}:latest"
    
    7 13
         - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
    
    8
    -    - podman build --layers=false $IMAGE -t ${TAG} -f .gitlab/ci/containers/base/Containerfile .
    
    14
    +    - podman build --layers=false $IMAGE -t ${TAG} --build-arg APPLICATION_CHOICE="${APPLICATION_CHOICE}" -f .gitlab/ci/containers/base/Containerfile .
    
    9 15
         - |
    
    10 16
           echo -e "\e[33mPushing new image to registry as ${TAG}\e[0m"
    
    11 17
           podman push ${TAG}
    

  • _______________________________________________
    tor-commits mailing list -- tor-commits@xxxxxxxxxxxxxxxxxxxx
    To unsubscribe send an email to tor-commits-leave@xxxxxxxxxxxxxxxxxxxx