Skip to content

Commit 20f2497

Browse files
Update CI scripts
1 parent 8005092 commit 20f2497

File tree

2 files changed

+26
-2
lines changed

2 files changed

+26
-2
lines changed

src/bootstrap/mk/Makefile.in

+4
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ check-aux:
4545
src/tools/cargo \
4646
src/tools/cargotest \
4747
$(BOOTSTRAP_ARGS)
48+
check-aux-and-gui: check-aux
49+
$(Q)$(BOOTSTRAP) test --stage 2 \
50+
src/test/rustdoc-gui \
51+
$(BOOTSTRAP_ARGS)
4852
check-bootstrap:
4953
$(Q)$(CFG_PYTHON) $(CFG_SRC_DIR)src/bootstrap/bootstrap_test.py
5054
dist:

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

+22-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,30 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1717
libgl1-mesa-dev \
1818
llvm-dev \
1919
libfreetype6-dev \
20-
libexpat1-dev
20+
libexpat1-dev \
21+
libexpat1-dev \
22+
gnupg \
23+
apt-utils \
24+
wget \
25+
fonts-ipafont-gothic \
26+
fonts-wqy-zenhei \
27+
fonts-thai-tlwg \
28+
fonts-kacst \
29+
fonts-freefont-ttf \
30+
libxss1 \
31+
libxtst6
32+
33+
RUN curl -sL https://nodejs.org/dist/v14.4.0/node-v14.4.0-linux-x64.tar.xz | tar -xJ
34+
ENV PATH="/node-v14.4.0-linux-x64/bin:${PATH}"
35+
36+
# Install required dependencies from browser-UI-test framework
37+
# For now, we need to use `--unsafe-perm=true` to go around an issue when npm tries
38+
# to create a new folder. For reference:
39+
# https://github.com/puppeteer/puppeteer/issues/375
40+
RUN npm install browser-ui-test -g --unsafe-perm=true
2141

2242
COPY scripts/sccache.sh /scripts/
2343
RUN sh /scripts/sccache.sh
2444

2545
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu
26-
ENV RUST_CHECK_TARGET check-aux
46+
ENV RUST_CHECK_TARGET check-aux-and-gui

0 commit comments

Comments
 (0)