From fb3ec6b6ad8a6b34b027f68c5dff95d6c5da0a72 Mon Sep 17 00:00:00 2001
From: TristanDebrunner <tdebrunner@atlantissports.org>
Date: Fri, 12 Jan 2024 13:35:04 -0700
Subject: [PATCH] Bump rust version in xc builds (#267)

---
 xc/linux-arm/Dockerfile-aarch64  | 2 +-
 xc/linux-arm/Dockerfile-armv7    | 2 +-
 xc/linux-arm/build_containers.sh | 2 +-
 xc/linux-arm/do_xc_build.sh      | 2 +-
 xc/windows/Dockerfile            | 2 +-
 xc/windows/build_container.sh    | 2 +-
 xc/windows/do_xc_build.sh        | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/xc/linux-arm/Dockerfile-aarch64 b/xc/linux-arm/Dockerfile-aarch64
index a4e89a90..eb70d868 100644
--- a/xc/linux-arm/Dockerfile-aarch64
+++ b/xc/linux-arm/Dockerfile-aarch64
@@ -1,5 +1,5 @@
 # We'll just use the official Rust image rather than build our own from scratch
-FROM arm64v8/rust:1.66.1-slim-bullseye
+FROM arm64v8/rust:1.75.0-slim-bullseye
 
 ENV KEYRINGS /usr/local/share/keyrings
 
diff --git a/xc/linux-arm/Dockerfile-armv7 b/xc/linux-arm/Dockerfile-armv7
index 9d0d5794..4b3a56f1 100644
--- a/xc/linux-arm/Dockerfile-armv7
+++ b/xc/linux-arm/Dockerfile-armv7
@@ -2,7 +2,7 @@
 # The above line allows the tempfs workaround used below
 
 # We'll just use the official Rust image rather than build our own from scratch
-FROM arm32v7/rust:1.66.1-slim-bullseye
+FROM arm32v7/rust:1.75.0-slim-bullseye
 
 ENV KEYRINGS /usr/local/share/keyrings
 
diff --git a/xc/linux-arm/build_containers.sh b/xc/linux-arm/build_containers.sh
index 19ce9d91..bb55a72f 100755
--- a/xc/linux-arm/build_containers.sh
+++ b/xc/linux-arm/build_containers.sh
@@ -1,4 +1,4 @@
-RUST_VERSION="1.66"
+RUST_VERSION="1.75"
 
 docker build -f Dockerfile-aarch64 -t "linux-rust-$RUST_VERSION-xc-aarch64" .
 docker build -f Dockerfile-armv7 -t "linux-rust-$RUST_VERSION-xc-armv7" .
diff --git a/xc/linux-arm/do_xc_build.sh b/xc/linux-arm/do_xc_build.sh
index 344d346f..2711a42e 100755
--- a/xc/linux-arm/do_xc_build.sh
+++ b/xc/linux-arm/do_xc_build.sh
@@ -1,4 +1,4 @@
-RUST_VERSION="1.66"
+RUST_VERSION="1.75"
 
 if [ -z $1 ]; then
     TARGET_TRIPLE="aarch64-unknown-linux-gnu"
diff --git a/xc/windows/Dockerfile b/xc/windows/Dockerfile
index 679696ba..0326988d 100644
--- a/xc/windows/Dockerfile
+++ b/xc/windows/Dockerfile
@@ -1,5 +1,5 @@
 # We'll just use the official Rust image rather than build our own from scratch
-FROM docker.io/library/rust:1.74.0-slim-bullseye
+FROM docker.io/library/rust:1.75.0-slim-bullseye
 
 ENV KEYRINGS /usr/local/share/keyrings
 
diff --git a/xc/windows/build_container.sh b/xc/windows/build_container.sh
index db017f1e..42e8c5f6 100755
--- a/xc/windows/build_container.sh
+++ b/xc/windows/build_container.sh
@@ -1 +1 @@
-docker build -t windows-rust-1.74-xc .
+docker build -t windows-rust-1.75-xc .
diff --git a/xc/windows/do_xc_build.sh b/xc/windows/do_xc_build.sh
index d863bdf2..3f8f5bd7 100755
--- a/xc/windows/do_xc_build.sh
+++ b/xc/windows/do_xc_build.sh
@@ -1,7 +1,7 @@
 CONTAINER_CMD="cargo build --bin refbox --target x86_64-pc-windows-msvc --release"
 CONTAINER_WORKDIR="/workdir/uwh-refbox-rs"
 
-CONTAINER_NAME="$(docker create -t -w "$CONTAINER_WORKDIR/" windows-rust-1.74-xc /bin/bash -c "$CONTAINER_CMD")"
+CONTAINER_NAME="$(docker create -t -w "$CONTAINER_WORKDIR/" windows-rust-1.75-xc /bin/bash -c "$CONTAINER_CMD")"
 
 BASE_DIR="$(dirname "$0")/../.."