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

Commits:

1 changed file:

Changes:

  • .gitlab/ci/containers/base/Containerfile
    ... ... @@ -18,8 +18,12 @@ RUN apt-get update && apt-get install -y \
    18 18
     RUN git clone --single-branch --depth 1 https://gitlab.torproject.org/tpo/applications/tor-browser.git
    
    19 19
     
    
    20 20
     # Bootstrap will download and install all dependencies required for building / linting / etc.
    
    21
    +#
    
    22
    +# Note: mozcheck is usually built at lint time and not fetched at bootstrap time.
    
    23
    +# We need to do it manually so it's available come lint time.
    
    21 24
     RUN cd tor-browser && \
    
    22 25
         yes | MOZBUILD_STATE_PATH=/var/tmp/mozbuild ./mach bootstrap --application-choice "$APPLICATION_CHOICE" && \
    
    26
    +    ./mach artifact toolchain --from-build toolchain-linux64-mozcheck && mv mozcheck /var/tmp/mozbuild && \
    
    23 27
         cd ..
    
    24 28
     
    
    25 29
     RUN rm -rf tor-browser && \
    
    ... ... @@ -40,6 +44,7 @@ WORKDIR /home/gitlab-runner
    40 44
     # Install Rust for the gitlab-runner user.
    
    41 45
     RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
    
    42 46
     ENV PATH="/var/tmp/mozbuild/clang/bin:/home/gitlab-runner/.cargo/bin:$PATH"
    
    47
    +ENV MOZ_FETCHES_DIR="/var/tmp/mozbuild"
    
    43 48
     RUN echo "$APPLICATION_CHOICE" | grep -qi android && \
    
    44 49
         rustup target add armv7-linux-androideabi \
    
    45 50
             aarch64-linux-android \