Skip to content

Commit fb88811

Browse files
borsbors
committed
Auto merge of rust-lang#100606 - cuviper:upgrade-linux-ci, r=Mark-Simulacrum
ci: Upgrade non-dist Linux testers from ubuntu:16.04 to 22.04 The main goal of updating to 22.04 is to get away from `llvm.allow-old-toolchain`. A side benefit is that they can also use the system `cmake` instead of building one.
2 parents 4f9898a + b96cde7 commit fb88811

File tree

7 files changed

+26
-52
lines changed

7 files changed

+26
-52
lines changed

‎src/bootstrap/test.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -854,7 +854,10 @@ fn get_browser_ui_test_version_inner(npm: &Path, global: bool) -> Option<String>
854854
.output()
855855
.map(|output| String::from_utf8_lossy(&output.stdout).into_owned())
856856
.unwrap_or(String::new());
857-
lines.lines().find_map(|l| l.split(":browser-ui-test@").skip(1).next()).map(|v| v.to_owned())
857+
lines
858+
.lines()
859+
.find_map(|l| l.split(':').nth(1)?.strip_prefix("browser-ui-test@"))
860+
.map(|v| v.to_owned())
858861
}
859862

860863
fn get_browser_ui_test_version(npm: &Path) -> Option<String> {

‎src/ci/docker/host-x86_64/i686-gnu-nopt/Dockerfile

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:22.04
22

3+
ARG DEBIAN_FRONTEND=noninteractive
34
RUN apt-get update && apt-get install -y --no-install-recommends \
45
g++-multilib \
56
make \
@@ -20,18 +21,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2021
COPY scripts/sccache.sh /scripts/
2122
RUN sh /scripts/sccache.sh
2223

23-
COPY scripts/cmake.sh /scripts/
24-
RUN /scripts/cmake.sh
25-
2624
RUN mkdir -p /config
2725
RUN echo "[rust]" > /config/nopt-std-config.toml
2826
RUN echo "optimize = false" >> /config/nopt-std-config.toml
2927

30-
# We are intentionally allowing an old toolchain on this builder (and that's
31-
# incompatible with LLVM downloads today).
32-
ENV NO_DOWNLOAD_CI_LLVM 1
33-
34-
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests \
35-
--set llvm.allow-old-toolchain
28+
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu --disable-optimize-tests
3629
ENV SCRIPT python3 ../x.py test --stage 0 --config /config/nopt-std-config.toml library/std \
3730
&& python3 ../x.py --stage 2 test

‎src/ci/docker/host-x86_64/i686-gnu/Dockerfile

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:22.04
22

3+
ARG DEBIAN_FRONTEND=noninteractive
34
RUN apt-get update && apt-get install -y --no-install-recommends \
45
g++-multilib \
56
make \
@@ -20,14 +21,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2021
COPY scripts/sccache.sh /scripts/
2122
RUN sh /scripts/sccache.sh
2223

23-
COPY scripts/cmake.sh /scripts/
24-
RUN /scripts/cmake.sh
25-
26-
# We are intentionally allowing an old toolchain on this builder (and that's
27-
# incompatible with LLVM downloads today).
28-
ENV NO_DOWNLOAD_CI_LLVM 1
29-
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu \
30-
--set llvm.allow-old-toolchain
24+
ENV RUST_CONFIGURE_ARGS --build=i686-unknown-linux-gnu
3125
# Exclude some tests that are unlikely to be platform specific, to speed up
3226
# this slow job.
3327
ENV SCRIPT python3 ../x.py --stage 2 test \

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

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:22.04
22

3+
ARG DEBIAN_FRONTEND=noninteractive
34
RUN apt-get update && apt-get install -y --no-install-recommends \
45
g++ \
56
make \
@@ -23,13 +24,5 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
2324
COPY scripts/sccache.sh /scripts/
2425
RUN sh /scripts/sccache.sh
2526

26-
COPY scripts/cmake.sh /scripts/
27-
RUN /scripts/cmake.sh
28-
29-
# We are intentionally allowing an old toolchain on this builder (and that's
30-
# incompatible with LLVM downloads today).
31-
ENV NO_DOWNLOAD_CI_LLVM 1
32-
33-
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu \
34-
--set llvm.allow-old-toolchain
27+
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu
3528
ENV RUST_CHECK_TARGET check-aux

‎src/ci/docker/host-x86_64/x86_64-gnu-distcheck/Dockerfile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:22.04
22

3+
ARG DEBIAN_FRONTEND=noninteractive
34
RUN apt-get update && apt-get install -y --no-install-recommends \
45
g++ \
56
make \
@@ -19,14 +20,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1920
COPY scripts/sccache.sh /scripts/
2021
RUN sh /scripts/sccache.sh
2122

22-
COPY scripts/cmake.sh /scripts/
23-
RUN /scripts/cmake.sh
24-
25-
# We are intentionally allowing an old toolchain on this builder (and that's
26-
# incompatible with LLVM downloads today).
23+
# We are disabling CI LLVM since distcheck is an offline build.
2724
ENV NO_DOWNLOAD_CI_LLVM 1
2825

29-
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --set rust.ignore-git=false \
30-
--set llvm.allow-old-toolchain
26+
ENV RUST_CONFIGURE_ARGS --build=x86_64-unknown-linux-gnu --set rust.ignore-git=false
3127
ENV SCRIPT python3 ../x.py --stage 2 test distcheck
3228
ENV DIST_SRC 1

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
FROM ubuntu:16.04
1+
FROM ubuntu:22.04
22

3+
ARG DEBIAN_FRONTEND=noninteractive
34
RUN apt-get update && apt-get install -y --no-install-recommends \
45
g++ \
56
make \
@@ -27,6 +28,7 @@ RUN apt-get install -y \
2728
libdbus-1-3 \
2829
libexpat1 \
2930
libfontconfig1 \
31+
libgbm1 \
3032
libgcc1 \
3133
libgconf-2-4 \
3234
libgdk-pixbuf2.0-0 \
@@ -59,13 +61,10 @@ RUN apt-get install -y \
5961
COPY scripts/sccache.sh /scripts/
6062
RUN sh /scripts/sccache.sh
6163

62-
COPY scripts/cmake.sh /scripts/
63-
RUN /scripts/cmake.sh
64-
6564
COPY host-x86_64/x86_64-gnu-tools/checktools.sh /tmp/
6665

67-
RUN curl -sL https://nodejs.org/dist/v14.4.0/node-v14.4.0-linux-x64.tar.xz | tar -xJ
68-
ENV NODE_FOLDER=/node-v14.4.0-linux-x64/bin
66+
RUN curl -sL https://nodejs.org/dist/v14.20.0/node-v14.20.0-linux-x64.tar.xz | tar -xJ
67+
ENV NODE_FOLDER=/node-v14.20.0-linux-x64/bin
6968
ENV PATH="$NODE_FOLDER:${PATH}"
7069

7170
COPY host-x86_64/x86_64-gnu-tools/browser-ui-test.version /tmp/
@@ -80,14 +79,10 @@ COPY host-x86_64/x86_64-gnu-tools/browser-ui-test.version /tmp/
8079
# the local version of the package is different than the one used by the CI.
8180
RUN npm install -g browser-ui-test@$(head -n 1 /tmp/browser-ui-test.version) --unsafe-perm=true
8281

83-
# We are intentionally allowing an old toolchain on this builder (and that's
84-
# incompatible with LLVM downloads today).
85-
ENV NO_DOWNLOAD_CI_LLVM 1
86-
8782
ENV RUST_CONFIGURE_ARGS \
88-
--set llvm.allow-old-toolchain \
8983
--build=x86_64-unknown-linux-gnu \
9084
--save-toolstates=/tmp/toolstate/toolstates.json
9185

9286
ENV SCRIPT /tmp/checktools.sh ../x.py && \
93-
NODE_PATH=`npm root -g` python3 ../x.py test src/test/rustdoc-gui --stage 2
87+
NODE_PATH=`npm root -g` python3 ../x.py test src/test/rustdoc-gui --stage 2 \
88+
--test-args "'--no-sandbox --jobs 1'"

‎src/test/rustdoc-gui/type-declation-overflow.goml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ assert-property: (".item-decl pre", {"scrollWidth": "950"})
3232
size: (600, 600)
3333
goto: file://|DOC_PATH|/lib2/too_long/struct.SuperIncrediblyLongLongLongLongLongLongLongGigaGigaGigaMegaLongLongLongStructName.html
3434
// It shouldn't have an overflow in the topbar either.
35-
assert-property: (".mobile-topbar .location", {"scrollWidth": "492"})
36-
assert-property: (".mobile-topbar .location", {"clientWidth": "492"})
35+
assert-property: (".mobile-topbar .location", {"scrollWidth": "502"})
36+
assert-property: (".mobile-topbar .location", {"clientWidth": "502"})
3737
assert-css: (".mobile-topbar .location", {"overflow-x": "hidden"})

0 commit comments

Comments
 (0)