From 0cb8ac139c4382e97efff32058fe48e9d0dca7db Mon Sep 17 00:00:00 2001 From: Dirk Stolle Date: Sun, 31 Dec 2023 23:49:26 +0100 Subject: [PATCH 1/2] chore: Update GitHub Actions CI The following updates are performed: * update actions/checkout to v4 * replace unmaintained actions-rs/toolchain by dtolnay/rust-toolchain * replace unmaintained actions-rs/cargo by direct invocation of cargo --- .github/workflows/ci.yml | 18 ++++++------------ .github/workflows/merge-group-commit-lint.yml | 2 +- .github/workflows/release.yml | 9 +++------ rust-toolchain | 1 - 4 files changed, 10 insertions(+), 20 deletions(-) delete mode 100644 rust-toolchain diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87c6cca..df56878 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,18 +13,15 @@ jobs: name: 🗒 Check Rust formatting steps: - name: ⬇️ Checkout Source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: 🦀 Install Rustfmt - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: components: rustfmt - name: 🔧 Check - uses: actions-rs/cargo@v1 - with: - command: fmt - args: --all -- --check + run: cargo fmt --all -- --check clippy_correctness_checks: runs-on: ubuntu-latest @@ -36,7 +33,7 @@ jobs: - { target: "x86_64-unknown-linux-gnu", target_dir: "target" } steps: - name: ⬇️ Checkout Source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: 🧰 Install dependencies run: | @@ -47,7 +44,7 @@ jobs: - name: 🧰 Install Clippy if: matrix.config.target != 'wasm32-unknown-unknown' - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: components: clippy @@ -65,9 +62,6 @@ jobs: ci-${{ matrix.config.target }}- - name: 🔧 Check - uses: actions-rs/cargo@v1 env: CARGO_TARGET_DIR: ${{ matrix.config.target_dir }} - with: - command: clippy - args: --target ${{ matrix.config.target }} --locked -- -W clippy::correctness -D warnings + run: cargo clippy --target ${{ matrix.config.target }} --locked -- -W clippy::correctness -D warnings diff --git a/.github/workflows/merge-group-commit-lint.yml b/.github/workflows/merge-group-commit-lint.yml index a58e88e..d382f6d 100644 --- a/.github/workflows/merge-group-commit-lint.yml +++ b/.github/workflows/merge-group-commit-lint.yml @@ -9,7 +9,7 @@ jobs: runs-on: ubuntu-latest steps: - name: ⬇️ Checkout Source - uses: actions/checkout@v3 + uses: actions/checkout@v4 if: github.event_name == 'merge_group' with: fetch-depth: 2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a17b83c..79ea352 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,7 +18,7 @@ jobs: release_body: ${{ steps.git-cliff.outputs.content }} steps: - name: ⬇️ Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -67,14 +67,11 @@ jobs: fi - name: ⬇️ Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: 🦀 Setup Rust - uses: actions-rs/toolchain@v1 + uses: dtolnay/rust-toolchain@stable with: - toolchain: stable - override: true - profile: minimal target: ${{ matrix.config.target }} - name: 🔨 Build diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index bc8a658..0000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.74 From 8296ec7b32630cbf4db38daac4fd19401095db75 Mon Sep 17 00:00:00 2001 From: Dirk Stolle Date: Sun, 31 Dec 2023 23:59:16 +0100 Subject: [PATCH 2/2] fix: remove unused imports to make clippy happy --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index e2812a0..23c8020 100644 --- a/src/main.rs +++ b/src/main.rs @@ -19,7 +19,7 @@ mod prelude { }; pub use bevy::input::mouse::MouseScrollUnit; pub use bevy::input::mouse::MouseWheel; - pub use bevy::math::{ivec2, ivec3, uvec2, uvec3, vec2, vec3}; + pub use bevy::math::{ivec2, uvec2, vec2, vec3}; pub use bevy::prelude::*; pub use std::collections::{HashMap, HashSet}; }