Skip to content

Commit 9fadad7

Browse files
Manually set cache directory path when running GUI tests
1 parent 66bc97c commit 9fadad7

File tree

1 file changed

+10
-12
lines changed
  • src/ci/docker/host-x86_64/x86_64-gnu-tools

1 file changed

+10
-12
lines changed

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

+10-12
Original file line numberDiff line numberDiff line change
@@ -78,16 +78,6 @@ ENV PATH="$NODE_FOLDER:${PATH}"
7878

7979
COPY host-x86_64/x86_64-gnu-tools/browser-ui-test.version /tmp/
8080

81-
# For now, we need to use `--unsafe-perm=true` to go around an issue when npm tries
82-
# to create a new folder. For reference:
83-
# https://github.com/puppeteer/puppeteer/issues/375
84-
#
85-
# We also specify the version in case we need to update it to go around cache limitations.
86-
#
87-
# The `browser-ui-test.version` file is also used by bootstrap to emit warnings in case
88-
# the local version of the package is different than the one used by the CI.
89-
RUN npm install -g browser-ui-test@$(head -n 1 /tmp/browser-ui-test.version) --unsafe-perm=true
90-
9181
ENV RUST_CONFIGURE_ARGS \
9282
--build=x86_64-unknown-linux-gnu \
9383
--save-toolstates=/tmp/toolstate/toolstates.json \
@@ -100,6 +90,14 @@ COPY host-x86_64/dist-x86_64-linux/build-gccjit.sh /scripts/
10090

10191
RUN /scripts/build-gccjit.sh /scripts
10292

93+
# For now, we need to use `--unsafe-perm=true` to go around an issue when npm tries
94+
# to create a new folder. For reference:
95+
# https://github.com/puppeteer/puppeteer/issues/375
96+
#
97+
# We also specify the version in case we need to update it to go around cache limitations.
98+
#
99+
# The `browser-ui-test.version` file is also used by bootstrap to emit warnings in case
100+
# the local version of the package is different than the one used by the CI.
103101
ENV SCRIPT /tmp/checktools.sh ../x.py && \
104-
NODE_PATH=`npm root -g` python3 ../x.py test tests/rustdoc-gui --stage 2 \
105-
--test-args "'--no-sandbox --jobs 1'"
102+
npm install browser-ui-test@$(head -n 1 /tmp/browser-ui-test.version) --unsafe-perm=true && \
103+
python3 ../x.py test tests/rustdoc-gui --stage 2 --test-args "'--no-sandbox --jobs 1'"

0 commit comments

Comments
 (0)