Skip to content

Commit f720766

Browse files
Manually download chromium instead of letting yarn/npm doing it
1 parent 0d980a5 commit f720766

3 files changed

Lines changed: 9 additions & 0 deletions

File tree

src/ci/docker/host-x86_64/pr-check-1/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
3636
COPY host-x86_64/pr-check-1/check-default-config-profiles.sh /scripts/
3737
COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
3838

39+
ENV PUPPETEER_SKIP_DOWNLOAD 1
40+
3941
# Check library crates on all tier 1 targets.
4042
# We disable optimized compiler built-ins because that requires a C toolchain for the target.
4143
# We also skip the x86_64-unknown-linux-gnu target as it is well-tested by other jobs.

src/ci/docker/host-x86_64/tidy/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2424
mingw-w64 \
2525
&& rm -rf /var/lib/apt/lists/*
2626

27+
ENV PUPPETEER_SKIP_DOWNLOAD 1
28+
2729
COPY scripts/nodejs.sh /scripts/
2830
RUN sh /scripts/nodejs.sh /node
2931
ENV PATH="/node/bin:${PATH}"

src/ci/docker/host-x86_64/x86_64-gnu-tools/Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
5656
lsb-release \
5757
xdg-utils \
5858
wget \
59+
chromium-browser \
5960
# libgccjit dependencies
6061
flex \
6162
libmpfr-dev \
@@ -72,6 +73,10 @@ ENV GCC_EXEC_PREFIX="/usr/lib/gcc/"
7273

7374
COPY host-x86_64/x86_64-gnu-tools/checktools.sh /tmp/
7475

76+
# We already downloaded chromium so no need to download it again.
77+
ENV PUPPETEER_SKIP_DOWNLOAD 1
78+
ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser
79+
7580
COPY scripts/nodejs.sh /scripts/
7681
RUN sh /scripts/nodejs.sh /node
7782
ENV PATH="/node/bin:${PATH}"

0 commit comments

Comments
 (0)