Skip to content

Commit 6dee497

Browse files
committed
ci: Re-enable rust for linux test.
* Downgrade the rust toolchain for now to keep CI green. * Enable verbose kbuild.
1 parent 4f78a95 commit 6dee497

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

.github/workflows/bindgen.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
with:
2424
# TODO: Should ideally be stable, but we use some nightly-only
2525
# features.
26-
toolchain: nightly
26+
toolchain: nightly-2025-04-01
2727
components: rustfmt, clippy
2828

2929
- name: Run rustfmt
@@ -171,7 +171,7 @@ jobs:
171171
BINDGEN_FEATURE_RUNTIME: ${{matrix.feature_runtime}}
172172
BINDGEN_FEATURE_EXTRA_ASSERTS: ${{matrix.feature_extra_asserts}}
173173
BINDGEN_NO_DEFAULT_FEATURES: ${{matrix.no_default_features}}
174-
BINDGEN_RUST_FOR_LINUX_TEST: 0
174+
BINDGEN_RUST_FOR_LINUX_TEST: ${{matrix.os == 'ubuntu-latest' && matrix.llvm_version == '16.0' && matrix.feature_extra_asserts == 0 && 1 || 0}}
175175
run: ./ci/test.sh
176176

177177
check-cfg:

ci/test.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ if [ "$BINDGEN_RUST_FOR_LINUX_TEST" == "1" ]; then
9696
# and each update should only contain this change.
9797
#
9898
# Both commit hashes and tags are supported.
99-
LINUX_VERSION=v6.13-rc1
99+
LINUX_VERSION=v6.14-rc1
100100

101101
# Download Linux at a specific commit
102102
mkdir -p linux
@@ -125,13 +125,13 @@ CONFIG_KUNIT=y
125125
CONFIG_RUST_KERNEL_DOCTESTS=y
126126
EOF
127127

128-
make -C linux LLVM=1 -j$(($(nproc) + 1)) \
128+
make -C linux KBUILD_VERBOSE=1 LLVM=1 -j$(($(nproc) + 1)) \
129129
rustavailable \
130130
defconfig \
131131
rfl-for-bindgen-ci.config
132132

133133
# Build Rust for Linux
134-
make -C linux LLVM=1 -j$(($(nproc) + 1)) \
134+
make -C linux LLVM=1 KBUILD_VERBOSE=1 -j$(($(nproc) + 1)) \
135135
samples/rust/rust_minimal.o \
136136
samples/rust/rust_print_main.o \
137137
drivers/net/phy/ax88796b_rust.o

0 commit comments

Comments
 (0)