Skip to content

Commit efb3ada

Browse files
waywardmonkeyssebcrozet
authored andcommitted
Fix no-std CI build configuration
* Stop using `xargo` and just use a regular `cargo` build. * Use `stable` rather than `nightly` as that works with `cargo`. * Update from `actions-rs/toolchain` for this job to `dtolnay/rust-toolchain` as the `actions-rs` action is unmaintained. * Switch from `x86_64-unknown-linux-gnu` to `x86_64-unknown-none` as that is a 64 bit target that has no `std` lib. * Keep the 32 bit ARM target testing to keep that coverage. * Fix the `rand-no-std` test to pass that feature to the build.
1 parent 6a1b839 commit efb3ada

File tree

2 files changed

+15
-23
lines changed

2 files changed

+15
-23
lines changed

.github/Xargo.toml

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/nalgebra-ci-build.yml

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -106,27 +106,24 @@ jobs:
106106
build-no-std:
107107
runs-on: ubuntu-latest
108108
steps:
109-
- uses: actions/checkout@v2
110-
- name: Install latest nightly
111-
uses: actions-rs/toolchain@v1
109+
- uses: actions/checkout@v4
110+
- name: Install latest stable
111+
uses: dtolnay/rust-toolchain@master
112112
with:
113-
toolchain: nightly
114-
override: true
115-
components: rustfmt
116-
- name: install xargo
117-
run: cp .github/Xargo.toml .; rustup component add rust-src; cargo install -f xargo;
118-
- name: build x86_64-unknown-linux-gnu
119-
run: xargo build --verbose --no-default-features --target=x86_64-unknown-linux-gnu;
120-
- name: build x86_64-unknown-linux-gnu --features rand-no-std
121-
run: xargo build --verbose --no-default-features --target=x86_64-unknown-linux-gnu;
122-
- name: build x86_64-unknown-linux-gnu --features alloc
123-
run: xargo build --verbose --no-default-features --features alloc --target=x86_64-unknown-linux-gnu;
113+
toolchain: stable
114+
targets: "x86_64-unknown-none,thumbv7em-none-eabihf"
115+
- name: build x86_64-unknown-none
116+
run: cargo build --verbose --no-default-features --target=x86_64-unknown-none
117+
- name: build x86_64-unknown-none --features rand-no-std
118+
run: cargo build --verbose --no-default-features --features rand-no-std --target=x86_64-unknown-none
119+
- name: build x86_64-unknown-none --features alloc
120+
run: cargo build --verbose --no-default-features --features alloc --target=x86_64-unknown-none
124121
- name: build thumbv7em-none-eabihf
125-
run: xargo build --verbose --no-default-features --target=thumbv7em-none-eabihf;
126-
- name: build x86_64-unknown-linux-gnu nalgebra-glm
127-
run: xargo build --verbose --no-default-features -p nalgebra-glm --target=x86_64-unknown-linux-gnu;
122+
run: cargo build --verbose --no-default-features --target=thumbv7em-none-eabihf
123+
- name: build x86_64-unknown-none nalgebra-glm
124+
run: cargo build --verbose --no-default-features -p nalgebra-glm --target=x86_64-unknown-none
128125
- name: build thumbv7em-none-eabihf nalgebra-glm
129-
run: xargo build --verbose --no-default-features -p nalgebra-glm --target=thumbv7em-none-eabihf;
126+
run: cargo build --verbose --no-default-features -p nalgebra-glm --target=thumbv7em-none-eabihf
130127
docs:
131128
runs-on: ubuntu-latest
132129
steps:

0 commit comments

Comments
 (0)