Skip to content

Commit

Permalink
Bump rust version in xc builds (#267)
Browse files Browse the repository at this point in the history
  • Loading branch information
TristanDebrunner authored Jan 12, 2024
1 parent 3ba09c3 commit fb3ec6b
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion xc/linux-arm/Dockerfile-aarch64
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion xc/linux-arm/Dockerfile-armv7
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion xc/linux-arm/build_containers.sh
Original file line number Diff line number Diff line change
@@ -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" .
2 changes: 1 addition & 1 deletion xc/linux-arm/do_xc_build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
RUST_VERSION="1.66"
RUST_VERSION="1.75"

if [ -z $1 ]; then
TARGET_TRIPLE="aarch64-unknown-linux-gnu"
Expand Down
2 changes: 1 addition & 1 deletion xc/windows/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion xc/windows/build_container.sh
Original file line number Diff line number Diff line change
@@ -1 +1 @@
docker build -t windows-rust-1.74-xc .
docker build -t windows-rust-1.75-xc .
2 changes: 1 addition & 1 deletion xc/windows/do_xc_build.sh
Original file line number Diff line number Diff line change
@@ -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")/../.."

Expand Down

0 comments on commit fb3ec6b

Please sign in to comment.