Skip to content

Try to fix rust for linux CI #3187

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 1 commit into from
Apr 4, 2025
Merged

Try to fix rust for linux CI #3187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions .github/workflows/bindgen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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: |
Expand All @@ -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:
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.13-rc1
LINUX_VERSION=v6.14-rc1

# 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 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
Expand Down
Loading