Auto merge of #3220 - JohnTitor:sparc64-2022-12-09, r=<try>

Use the latest Debian for SPARC64
rust-lang · Apr 24, 2023 · a761c66 · a761c66
2 parents 890fc93 + 3e01cb8
commit a761c66
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/ci/docker/sparc64-unknown-linux-gnu/Dockerfile b/ci/docker/sparc64-unknown-linux-gnu/Dockerfile
@@ -1,5 +1,4 @@
-# FIXME: Update to 22.04 once Debian image of sparc64 has a newer glibc.
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
         curl ca-certificates \

diff --git a/ci/linux-sparc64.sh b/ci/linux-sparc64.sh
@@ -5,7 +5,7 @@ set -ex
 mkdir -m 777 /qemu
 cd /qemu
 
-curl --retry 5 -LO https://cdimage.debian.org/cdimage/ports/snapshots/2022-03-28/debian-11.0.0-sparc64-NETINST-1.iso
+curl --retry 5 -LO https://cdimage.debian.org/cdimage/ports/snapshots/2022-12-09/debian-11.0.0-sparc64-NETINST-1.iso
 7z e debian-11.0.0-sparc64-NETINST-1.iso install/initrd.gz
 7z e debian-11.0.0-sparc64-NETINST-1.iso install/vmlinux
 mv vmlinux kernel