Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: update ubuntu:20.04 builders to 22.04 #113931

Merged
merged 13 commits into from
Jul 28, 2023
Merged

ci: update ubuntu:20.04 builders to 22.04 #113931

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0333ecc
ci: Update aarch64-gnu to ubuntu:22.04
cuviper Jul 18, 2023
b160c8f
ci: Update armhf-gnu to ubuntu:22.04
cuviper Jul 19, 2023
35b87d0
ci: Update dist-powerpc64le-linux to ubuntu:22.04
cuviper Jul 19, 2023
5dff575
ci: Update dist-various-1 to ubuntu:22.04
cuviper Jul 19, 2023
69d56ab
ci: Update dist-various-2 to ubuntu:22.04
cuviper Jul 20, 2023
a82fa0d
ci: Update dist-x86_64-musl to ubuntu:22.04
cuviper Jul 20, 2023
ecb84f6
ci: Update dist-x86_64-netbsd to ubuntu:22.04
cuviper Jul 21, 2023
294b214
ci: Update test-various to ubuntu:22.04
cuviper Jul 21, 2023
137de93
ci: Update wasm32 to ubuntu:22.04
cuviper Jul 21, 2023
e9e4248
ci: Update x86_64-gnu-debug to ubuntu:22.04
cuviper Jul 21, 2023
d34a2b1
ci: Update x86_64-gnu-nopt to ubuntu:22.04
cuviper Jul 21, 2023
3585562
ci: Update x86_64-gnu to ubuntu:22.04
cuviper Jul 21, 2023
3cd3a91
ci: use `armv7-a+fp` for `armv7-unknown-linux_musleabihf`
cuviper Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/ci/docker/host-aarch64/aarch64-gnu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y --no-install-recommends \
g++ \
make \
ninja-build \
Expand All @@ -17,9 +18,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
xz-utils \
&& rm -rf /var/lib/apt/lists/*

COPY scripts/cmake.sh /scripts/
RUN /scripts/cmake.sh

COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

Expand Down
16 changes: 7 additions & 9 deletions src/ci/docker/host-x86_64/armhf-gnu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM ubuntu:20.04
FROM ubuntu:22.04

RUN apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update -y && apt-get install -y --no-install-recommends \
bc \
bzip2 \
ca-certificates \
Expand Down Expand Up @@ -34,14 +35,14 @@ WORKDIR /build
# the kernel. This file was generated by running `make vexpress_defconfig`
# followed by `make menuconfig` and then enabling the IPv6 protocol page.
COPY host-x86_64/armhf-gnu/vexpress_config /build/.config
RUN curl https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.4.253.tar.xz | \
RUN curl https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-4.14.320.tar.xz | \
tar xJf - && \
cd /build/linux-4.4.253 && \
cd /build/linux-4.14.320 && \
cp /build/.config . && \
make -j$(nproc) all && \
cp arch/arm/boot/zImage /tmp && \
cd /build && \
rm -rf linux-4.4.253
rm -rf linux-4.14.320

# Compile an instance of busybox as this provides a lightweight system and init
# binary which we will boot into. Only trick here is configuring busybox to
Expand All @@ -59,7 +60,7 @@ RUN curl https://www.busybox.net/downloads/busybox-1.32.1.tar.bz2 | tar xjf - &&
# Download the ubuntu rootfs, which we'll use as a chroot for all our tests.
WORKDIR /tmp
RUN mkdir rootfs/ubuntu
RUN curl https://cdimage.ubuntu.com/ubuntu-base/releases/20.04/release/ubuntu-base-20.04.1-base-armhf.tar.gz | \
RUN curl https://cdimage.ubuntu.com/ubuntu-base/releases/22.04/release/ubuntu-base-22.04.2-base-armhf.tar.gz | \
tar xzf - -C rootfs/ubuntu && \
cd rootfs && mkdir proc sys dev etc etc/init.d

Expand All @@ -76,9 +77,6 @@ RUN arm-linux-gnueabihf-gcc addentropy.c -o rootfs/addentropy -static
# Source of the file: https://github.com/vfdev-5/qemu-rpi2-vexpress/raw/master/vexpress-v2p-ca15-tc1.dtb
RUN curl -O https://ci-mirrors.rust-lang.org/rustc/vexpress-v2p-ca15-tc1.dtb

COPY scripts/cmake.sh /scripts/
RUN /scripts/cmake.sh

COPY scripts/sccache.sh /scripts/
RUN sh /scripts/sccache.sh

Expand Down
Loading