From 67fea1a1a2e77464f96f184b298aed848ac38d53 Mon Sep 17 00:00:00 2001 From: Jonathan Schwender Date: Fri, 25 Aug 2023 16:08:10 +0200 Subject: [PATCH] Fix CI Commit 667de09279c3d5f0524216fefa949e64cbd3bc1a broke CI by adding rust-toolchain.toml, which changed the default rust version to nightly. Explicitly specify the rust version in CI to use the correct toolchain. --- .github/workflows/cbindgen.yml | 12 ++++++------ .github/workflows/deploy.yml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/cbindgen.yml b/.github/workflows/cbindgen.yml index 93023aa..f5081f7 100644 --- a/.github/workflows/cbindgen.yml +++ b/.github/workflows/cbindgen.yml @@ -23,11 +23,11 @@ jobs: - name: Run rustfmt run: | - cargo fmt --check + cargo +stable fmt --check - name: Run clippy run: | - cargo clippy --workspace -- -D warnings + cargo +stable clippy --workspace -- -D warnings - name: Install minimum supported Rust version id: msrv @@ -59,18 +59,18 @@ jobs: - name: Build run: | - cargo build --verbose + cargo +stable build --verbose - name: Build no-default-features run: | - cargo build --verbose --no-default-features + cargo +stable build --verbose --no-default-features - name: Test package env: CBINDGEN_TEST_VERIFY: 1 run: | - cargo package --verbose - (cd target/package/cbindgen-$(cargo run -- --version | cut -d ' ' -f 2) && cargo test --verbose) + cargo +stable package --verbose + (cd target/package/cbindgen-$(cargo +stable run -- --version | cut -d ' ' -f 2) && cargo +stable test --verbose) - name: Install nightly Rust uses: dtolnay/rust-toolchain@nightly diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 82b98d9..6aa6168 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -24,12 +24,12 @@ jobs: - name: semver run: | - cargo install cargo-semver-checks --locked + cargo +stable install cargo-semver-checks --locked cargo semver-checks check-release - name: Build cbindgen run: | - cargo build --release + cargo +stable build --release - name: Strip cbindgen run: |