Skip to content

ci: use stable again moving forward Rust for Linux job #3189

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
merged 2 commits into from
Apr 4, 2025
Merged

ci: use stable again moving forward Rust for Linux job #3189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71a80e3
ci: move forward Rust for Linux version to v6.14
ojeda Apr 4, 2025
957e0cd
ci: use stable toolchain again
ojeda Apr 4, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/bindgen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ jobs:
- name: Install stable
uses: dtolnay/rust-toolchain@master
with:
toolchain: 1.85.1
toolchain: stable
- name: Install libtinfo
if: matrix.os == 'ubuntu-latest'
run: |
Expand Down
6 changes: 3 additions & 3 deletions ci/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ if [ "$BINDGEN_RUST_FOR_LINUX_TEST" == "1" ]; then
# and each update should only contain this change.
#
# Both commit hashes and tags are supported.
LINUX_VERSION=v6.14-rc1
LINUX_VERSION=v6.14
Copy link
Contributor

Choose a reason for hiding this comment

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

Gah, so I was off by a RC then ;)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, that was very bad luck... :)


# Download Linux at a specific commit
mkdir -p linux
Expand Down Expand Up @@ -125,13 +125,13 @@ CONFIG_KUNIT=y
CONFIG_RUST_KERNEL_DOCTESTS=y
EOF

make -C linux KBUILD_VERBOSE=1 LLVM=1 -j$(($(nproc) + 1)) \
make -C linux LLVM=1 -j$(($(nproc) + 1)) \
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this might still be useful but either way. Yeah maybe it's too verbose.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I wasn't sure if you intended to keep it or it was just for debugging the issue, so I left the tree as it was before this happened.

It is fairly verbose, yeah; on the other hand, we build a tiny part of the kernel, so it should be OK.

rustavailable \
defconfig \
rfl-for-bindgen-ci.config

# Build Rust for Linux
make -C linux LLVM=1 KBUILD_VERBOSE=1 -j$(($(nproc) + 1)) \
make -C linux LLVM=1 -j$(($(nproc) + 1)) \
samples/rust/rust_minimal.o \
samples/rust/rust_print_main.o \
drivers/net/phy/ax88796b_rust.o
Expand Down
Loading