diff --git a/.github/workflows/bindgen.yml b/.github/workflows/bindgen.yml index d0112e367f..97cbac794f 100644 --- a/.github/workflows/bindgen.yml +++ b/.github/workflows/bindgen.yml @@ -18,7 +18,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Install stable + - name: Install nightly uses: dtolnay/rust-toolchain@master with: # TODO: Should ideally be stable, but we use some nightly-only @@ -154,7 +154,7 @@ jobs: - name: Install stable uses: dtolnay/rust-toolchain@master with: - toolchain: stable + toolchain: 1.85.1 - name: Install libtinfo if: matrix.os == 'ubuntu-latest' run: | @@ -171,7 +171,7 @@ jobs: BINDGEN_FEATURE_RUNTIME: ${{matrix.feature_runtime}} BINDGEN_FEATURE_EXTRA_ASSERTS: ${{matrix.feature_extra_asserts}} BINDGEN_NO_DEFAULT_FEATURES: ${{matrix.no_default_features}} - BINDGEN_RUST_FOR_LINUX_TEST: 0 + BINDGEN_RUST_FOR_LINUX_TEST: ${{matrix.os == 'ubuntu-latest' && matrix.llvm_version == '16.0' && matrix.feature_extra_asserts == 0 && 1 || 0}} run: ./ci/test.sh check-cfg: diff --git a/ci/test.sh b/ci/test.sh index 93bc9c2823..1edd37b3d0 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -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.13-rc1 + LINUX_VERSION=v6.14-rc1 # Download Linux at a specific commit mkdir -p linux @@ -125,13 +125,13 @@ CONFIG_KUNIT=y CONFIG_RUST_KERNEL_DOCTESTS=y EOF - make -C linux LLVM=1 -j$(($(nproc) + 1)) \ + make -C linux KBUILD_VERBOSE=1 LLVM=1 -j$(($(nproc) + 1)) \ rustavailable \ defconfig \ rfl-for-bindgen-ci.config # Build Rust for Linux - make -C linux LLVM=1 -j$(($(nproc) + 1)) \ + make -C linux LLVM=1 KBUILD_VERBOSE=1 -j$(($(nproc) + 1)) \ samples/rust/rust_minimal.o \ samples/rust/rust_print_main.o \ drivers/net/phy/ax88796b_rust.o