Skip to content

Enforce correct Rust versions #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thomasw04 merged 4 commits into from
Apr 4, 2026
Merged

Enforce correct Rust versions #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d8ab75
Create toolchain file
xarantolus Mar 31, 2026
165abba
Fix build context in actions
xarantolus Mar 31, 2026
e3ed67c
Documentation
xarantolus Mar 31, 2026
73d42a3
Reduce docker build context
xarantolus Mar 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ RUN --mount=type=cache,target=/var/cache/dnf,id=dev-dnf \
libusb1-devel \
openssl-devel \
lcov \
dtc \
dtc \
awk \
just \
python-pyelftools \
Expand Down Expand Up @@ -86,12 +86,16 @@ ENV CARGO_HOME=/usr/local/cargo
ENV KANI_HOME=/usr/local/kani
ENV PATH="/usr/local/cargo/bin:${PATH}"

ARG RUST_VERSION=1.93.1
WORKDIR /tmp

COPY rust-toolchain.toml /tmp/rust-toolchain.toml

RUN --mount=type=cache,target=/usr/local/cargo/registry \
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
| sh -s -- -y --no-modify-path --default-toolchain ${RUST_VERSION} && \
rustup component add rust-src llvm-tools-preview && \
rustup target add thumbv7em-none-eabihf thumbv7em-none-eabi
| sh -s -- -y --no-modify-path --default-toolchain none

# rustup show forces install of versions from the toolchain file
RUN rustup show

# Note: kani installs an additional toolchain...
RUN --mount=type=cache,target=/usr/local/cargo/registry \
Expand Down
22 changes: 22 additions & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# Build artifacts
build*/
target/
*.bin
*.img
*.info
symbols.map
*.gen.*
compile_commands.json

# Dev tooling / IDE
.vscode/
.cache/
.venv/
qemu/

# Git & CI (not needed in build context)
.git/
.github/

# Devcontainer config itself
.devcontainer/
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- name: Build and push Docker image
uses: docker/build-push-action@v2
with:
context: .devcontainer
context: .
file: .devcontainer/Dockerfile
push: ${{ github.ref == 'refs/heads/main' }}
tags: ${{ steps.set_output.outputs.container_name }}
Expand Down
4 changes: 4 additions & 0 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[toolchain]
channel = "1.94.0"
Copy link

Copilot AI Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pinning the toolchain to Rust 1.94.0 will make the workspace fail to compile because xtasks/crates/config/src/lib.rs contains #[rustversion::since(1.94)] compile_error!(...) (lines 154-155). Either lower the pinned toolchain below 1.94 for now, or remove/resolve that compile_error! gate before enforcing 1.94 via rust-toolchain.toml.

Suggested change
channel = "1.94.0"
channel = "1.93.0"

Copilot uses AI. Check for mistakes.
Copy link
Copy Markdown
Contributor Author

@xarantolus xarantolus Mar 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should merge this once the other branch that fixes this is merged

components = ["rust-src", "llvm-tools-preview"]
targets = ["thumbv7em-none-eabihf", "thumbv7em-none-eabi"]
Loading