Rollup merge of #115902 - Mark-Simulacrum:bump-ci, r=albertlarsan68

Fix up a few CI images This forward-ports changes made on the stable branch to fix CI (https://github.com/rust-lang/rust/pull/115787).
2023-09-18 13:02:19 +02:00 · 2023-09-18 13:02:19 +02:00 · 497701876f
commit 497701876f
parent 944c4134d2 abd265ed0e
3 changed files with 3 additions and 3 deletions
--- a/src/ci/docker/host-x86_64/arm-android/Dockerfile
+++ b/src/ci/docker/host-x86_64/arm-android/Dockerfile
@ -1,4 +1,4 @@
-FROM ubuntu:22.10
+FROM ubuntu:23.04

 ARG DEBIAN_FRONTEND=noninteractive
 COPY scripts/android-base-apt-get.sh /scripts/
--- a/src/ci/docker/host-x86_64/dist-android/Dockerfile
+++ b/src/ci/docker/host-x86_64/dist-android/Dockerfile
@ -1,4 +1,4 @@
-FROM ubuntu:22.10
+FROM ubuntu:23.04

 COPY scripts/android-base-apt-get.sh /scripts/
 RUN sh /scripts/android-base-apt-get.sh
--- a/src/ci/docker/host-x86_64/dist-various-1/install-x86_64-redox.sh
+++ b/src/ci/docker/host-x86_64/dist-various-1/install-x86_64-redox.sh
@ -2,5 +2,5 @@

 set -ex

-curl https://static.redox-os.org/toolchain/x86_64-unknown-redox/relibc-install.tar.gz | \
+curl https://ci-mirrors.rust-lang.org/rustc/2022-11-27-relibc-install.tar.gz | \
 tar --extract --gzip --directory /usr/local