From 71a80e3ffd6ca14f8f01b5db78ab90a7d4e6f313 Mon Sep 17 00:00:00 2001 From: Miguel Ojeda Date: Fri, 4 Apr 2025 23:24:27 +0200 Subject: [PATCH 1/2] ci: move forward Rust for Linux version to v6.14 v6.14 is the latest tag and it contains v6.14-rc2 which included the fix for the `soft-float` error (commit 6273a058383e ("x86: rust: set rustc-abi=x86-softfloat on rustc>=1.86.0") in Linux). Signed-off-by: Miguel Ojeda --- ci/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test.sh b/ci/test.sh index 1edd37b3d0..8cc2b511e0 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.14-rc1 + LINUX_VERSION=v6.14 # Download Linux at a specific commit mkdir -p linux From 957e0cde92888726c51b7b02dccc981363d576e3 Mon Sep 17 00:00:00 2001 From: Miguel Ojeda Date: Fri, 4 Apr 2025 23:25:28 +0200 Subject: [PATCH 2/2] ci: use stable toolchain again Now that the Rust for Linux job is moved forward to v6.14, we can use Rust 1.86.0, i.e. the current stable, again. Thus revert the previous change. Signed-off-by: Miguel Ojeda --- .github/workflows/bindgen.yml | 2 +- ci/test.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/bindgen.yml b/.github/workflows/bindgen.yml index 97cbac794f..3a90263bd0 100644 --- a/.github/workflows/bindgen.yml +++ b/.github/workflows/bindgen.yml @@ -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: | diff --git a/ci/test.sh b/ci/test.sh index 8cc2b511e0..ae93f2ad1d 100755 --- a/ci/test.sh +++ b/ci/test.sh @@ -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)) \ 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