From 24c5f81fac96dace083dcd70dfa921f2615d8dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Sun, 21 Apr 2024 18:31:32 +0200 Subject: [PATCH 1/5] ci: update `actions/checkout` to `v4` and remove explicit name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/build.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4018cea..9bdcc61 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,8 +16,7 @@ jobs: name: Check runs-on: ubuntu-latest steps: - - name: Checkout sources - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install stable toolchain uses: actions-rs/toolchain@v1 @@ -35,8 +34,7 @@ jobs: name: Test Suite runs-on: ubuntu-latest steps: - - name: Checkout sources - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install stable toolchain uses: actions-rs/toolchain@v1 @@ -54,8 +52,7 @@ jobs: name: Test Suite (unstable) runs-on: ubuntu-latest steps: - - name: Checkout sources - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install nightly toolchain uses: actions-rs/toolchain@v1 @@ -74,8 +71,7 @@ jobs: name: Test Suite (very_unstable) runs-on: ubuntu-latest steps: - - name: Checkout sources - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install nightly toolchain uses: actions-rs/toolchain@v1 @@ -95,8 +91,7 @@ jobs: name: Lints runs-on: ubuntu-latest steps: - - name: Checkout sources - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Install stable toolchain uses: actions-rs/toolchain@v1 From fb3b7409066377a4b58937b2c56683f2fd1a5640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Sun, 21 Apr 2024 18:33:50 +0200 Subject: [PATCH 2/5] ci: replace `actions-rs/toolchain` with `dtolnay/rust-toolchain` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/build.yml | 41 ++++++------------------------------- 1 file changed, 6 insertions(+), 35 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9bdcc61..7db9ab7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,13 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - name: Run cargo check uses: actions-rs/cargo@v1 @@ -35,13 +29,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: stable - override: true + - uses: dtolnay/rust-toolchain@stable - name: Run cargo test uses: actions-rs/cargo@v1 @@ -53,13 +41,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - - name: Install nightly toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true + - uses: dtolnay/rust-toolchain@nightly - name: Run cargo test --features unstable uses: actions-rs/cargo@v1 @@ -72,13 +54,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - - name: Install nightly toolchain - uses: actions-rs/toolchain@v1 - with: - profile: minimal - toolchain: nightly - override: true + - uses: dtolnay/rust-toolchain@nightly - name: Run cargo test --features very_unstable uses: actions-rs/cargo@v1 @@ -92,14 +68,9 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - - name: Install stable toolchain - uses: actions-rs/toolchain@v1 + - uses: dtolnay/rust-toolchain@stable with: - profile: minimal - toolchain: stable - override: true - components: rustfmt, clippy + components: clippy, rustfmt - name: Run cargo fmt uses: actions-rs/cargo@v1 From 8c3b5bff52d765b530837302262789de13300d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Sun, 21 Apr 2024 18:35:44 +0200 Subject: [PATCH 3/5] ci: replace `actions-rs/cargo` with direct calls to cargo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/build.yml | 40 ++++++------------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7db9ab7..cf5e028 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,11 +18,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - - - name: Run cargo check - uses: actions-rs/cargo@v1 - with: - command: check + - run: cargo check test: name: Test Suite @@ -30,11 +26,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - - - name: Run cargo test - uses: actions-rs/cargo@v1 - with: - command: test + - run: cargo test unstable: name: Test Suite (unstable) @@ -42,12 +34,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@nightly - - - name: Run cargo test --features unstable - uses: actions-rs/cargo@v1 - with: - command: test - args: --features unstable + - run: cargo test --features unstable very_unstable: name: Test Suite (very_unstable) @@ -55,13 +42,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@nightly - - - name: Run cargo test --features very_unstable - uses: actions-rs/cargo@v1 - with: - command: test - args: --features very_unstable - + - run: cargo test --features very_unstable lints: name: Lints @@ -71,14 +52,5 @@ jobs: - uses: dtolnay/rust-toolchain@stable with: components: clippy, rustfmt - - - name: Run cargo fmt - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check - - - name: Run cargo clippy - uses: actions-rs/cargo@v1 - with: - command: clippy + - run: cargo fmt --all --check + - run: cargo clippy From 68ca660247b0c3c43dda000d7f3e9b721980f602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Sun, 21 Apr 2024 18:36:30 +0200 Subject: [PATCH 4/5] ci: remove obsolete comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf5e028..a67ccc9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,9 +1,3 @@ -# Based on https://github.com/actions-rs/meta/blob/master/recipes/quickstart.md -# -# While our "example" application has the platform-specific code, -# for simplicity we are compiling and testing everything on the Ubuntu environment only. -# For multi-OS testing see the `cross.yml` workflow. - on: [push, pull_request] name: Build From 7afbc490a12ac67c13faa6f8af7e11cb73e0d02d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Sun, 21 Apr 2024 18:44:43 +0200 Subject: [PATCH 5/5] ci: run for whole workspace MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Kröning --- .github/workflows/build.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a67ccc9..92b5702 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - - run: cargo check + - run: cargo check --workspace test: name: Test Suite @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - - run: cargo test + - run: cargo test --workspace unstable: name: Test Suite (unstable) @@ -28,7 +28,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@nightly - - run: cargo test --features unstable + - run: cargo test --workspace --features unstable very_unstable: name: Test Suite (very_unstable) @@ -36,7 +36,7 @@ jobs: steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@nightly - - run: cargo test --features very_unstable + - run: cargo test --workspace --features very_unstable lints: name: Lints @@ -47,4 +47,4 @@ jobs: with: components: clippy, rustfmt - run: cargo fmt --all --check - - run: cargo clippy + - run: cargo clippy --workspace