Rust 1.70

.github/workflows/container-build.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       ZEPHYR_VERSION: ${{ matrix.zephyr_version }}
-      RUST_VERSION: 1.68.0
+      RUST_VERSION: 1.70.0
 
     permissions:
       contents: read

.github/workflows/main.yml

@@ -35,7 +35,7 @@ jobs:
           - run: false
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/${{ github.repository }}:zephyr-rust-${{ matrix.zephyr_version }}-1.68.0
+      image: ghcr.io/${{ github.repository }}:zephyr-rust-${{ matrix.zephyr_version }}-1.70.0
       credentials:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}

README.rst

@@ -10,14 +10,14 @@ Zephyr app.
 
 Version Compatibility
 =====================
-**Zephyr**: v2.3, v2.7.3, v3.4, v3.5, v3.6
+**Zephyr**: v2.3, v2.7.3, v3.7. 3.0-3.6 not supported.
 
-**Rust**: exactly 1.68.0
+**Rust**: exactly 1.70.0
 
 Please use one of the above Zephyr releases before reporting issues! At the
 time you are reading this, Zephyr's main branch will likely not work, though it
 is usually one 1-2 minor changes to support a new release. The project aims to
-support everything from 2.3 to the present.
+support 2.3, the LTS releases, and the latest release.
 
 Features
 ========
@@ -79,13 +79,13 @@ included as a submodule of this project. In practice, using a different
 compiler version often fails to compile because of Rust internally making heavy
 use of unstable compiler features.
 
-The current base is stable-1.68.0. Rustup is the default workflow, and the
+The current base is stable-1.70.0. Rustup is the default workflow, and the
 rust-toolchain file in this repo should cause rustup to automatically install
 and use the right version. If not, manually install:
 
 .. code-block:: console
 
-    rustup toolchain install 1.68.0
+    rustup toolchain install 1.70.0
 
 If supplying your own rustc and cargo, make sure they are the version above.
 The build will fail if it detects a version mismatch.

ci/Dockerfile.zephyr

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 as zephyr
+FROM ubuntu:24.04 AS zephyr
 
 ARG ZEPHYR_VERSION=2.4.0
 # Prevent prompts configuring tzdata
@@ -10,16 +10,21 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     python3-dev python3-pip python3-setuptools python3-tk python3-wheel xz-utils file \
     make gcc gcc-multilib g++-multilib libsdl2-dev
 
-RUN pip3 install -U west
+RUN pip3 install --break-system-packages -U west
 
 ENV WEST_BASE=/zephyrproject
 ENV ZEPHYR_BASE=${WEST_BASE}/zephyr
 WORKDIR ${WEST_BASE}
 RUN git clone https://github.com/zephyrproject-rtos/zephyr.git -b v${ZEPHYR_VERSION} --filter=tree:0 ${ZEPHYR_BASE}
+# Needed for building as root
+RUN if [ "${ZEPHYR_VERSION}" = "2.3.0" ]; then \
+        cd ${ZEPHYR_BASE}; \
+        git cherry-pick -n 66d1b3ce10635dd9988898479ce8b8f6516a98df; \
+    fi
 RUN west init -l ${ZEPHYR_BASE}
 RUN west update --narrow --fetch-opt=--filter=tree:0
 
-RUN pip3 install -r ${ZEPHYR_BASE}/scripts/requirements.txt
+RUN pip3 install --break-system-packages -r ${ZEPHYR_BASE}/scripts/requirements.txt
 
 ADD setup-sdk.sh /setup-sdk.sh
 RUN /setup-sdk.sh
@@ -29,7 +34,7 @@ ENV ZEPHYR_TOOLCHAIN_VARIANT=zephyr
 # Rust toolchain stage
 FROM zephyr
 
-ARG RUST_VERSION=1.68.0
+ARG RUST_VERSION=1.69.0
 ENV RUSTUP_HOME=/usr/local/rustup \
     CARGO_HOME=/usr/local/cargo \
     PATH=/usr/local/cargo/bin:$PATH \

ci/build-all.sh

@@ -2,7 +2,7 @@
 
 #rm -rf log
 
-ZEPHYR_VERSIONS="3.6.0 3.5.0 3.4.0 2.7.3 2.3.0"
+ZEPHYR_VERSIONS="3.7.0 2.7.3 2.3.0"
 
 #parallel \
 #    -j8 \

ci/env.sh

@@ -2,7 +2,7 @@
 
 ZEPHYR_RUST="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )/.."
 RUST_VERSION="$( rustc --version | awk '{print $2}' )"
-ZEPHYR_VERSION=${ZEPHYR_VERSION:-2.4.0}
+ZEPHYR_VERSION=${ZEPHYR_VERSION:-3.7.0}
 # Set CONTAINER_REGISTRY to something like "zephyr-rust:" to use local images
 CONTAINER_REGISTRY=${CONTAINER_REGISTRY:-ghcr.io/tylerwhall/zephyr-rust:zephyr-rust-}
 

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.68.0"
+channel = "1.70.0"
 profile = "minimal"

rust/build.sh

@@ -2,7 +2,7 @@
 
 HOST=$(rustc -vV | grep host: | cut -d ' ' -f 2)
 CARGO_ARGS="-v build --target=${RUST_TARGET_SPEC} --release"
-VERSION="1.68"
+VERSION="1.70"
 CURRENT_RUSTC_VERSION=$(rustc -vV | grep ^release: | cut -d ' ' -f 2 | cut -d '.' -f '1,2')
 
 # Assert cargo version matches the certified version