From fd785c4d67aa063b744974101183c77c2816e742 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Wed, 17 Jul 2024 21:09:47 +0700 Subject: [PATCH] ci: Use a regular `cargo` to build no-std targets. `xargo` is no longer needed and has been in maintenance mode for over 7 years. This can run on `stable` rather than requiring `nightly` The build doesn't need `rustfmt`, so don't require that it be installed. --- .github/Xargo.toml | 5 ----- .github/workflows/parry-ci-build.yml | 12 +++++------- 2 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 .github/Xargo.toml diff --git a/.github/Xargo.toml b/.github/Xargo.toml deleted file mode 100644 index 919803b5..00000000 --- a/.github/Xargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[target.x86_64-unknown-linux-gnu.dependencies] -alloc = {} - -[target.thumbv7em-none-eabihf.dependencies] -alloc = {} \ No newline at end of file diff --git a/.github/workflows/parry-ci-build.yml b/.github/workflows/parry-ci-build.yml index f8aff15f..ecf8470a 100644 --- a/.github/workflows/parry-ci-build.yml +++ b/.github/workflows/parry-ci-build.yml @@ -56,17 +56,15 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Install latest nightly + - name: Install stable Rust uses: dtolnay/rust-toolchain@master with: - toolchain: nightly - components: rustfmt - - name: install xargo - run: cp .github/Xargo.toml .; rustup component add rust-src; cargo install -f xargo; + toolchain: stable + targets: "x86_64-unknown-linux-gnu,thumbv7em-none-eabihf" - name: build x86_64-unknown-linux-gnu - run: xargo build --verbose --no-default-features --features required-features --target=x86_64-unknown-linux-gnu; + run: cargo build --verbose --no-default-features --features required-features --target=x86_64-unknown-linux-gnu - name: build thumbv7em-none-eabihf - run: xargo build --verbose --no-default-features --features required-features --target=thumbv7em-none-eabihf; + run: cargo build --verbose --no-default-features --features required-features --target=thumbv7em-none-eabihf build-doc: runs-on: ubuntu-latest env: