Skip to content

Commit

Permalink
Merge pull request #25 from striezel-stash/actions-update
Browse files Browse the repository at this point in the history
chore: Update GitHub Actions CI
  • Loading branch information
Zac8668 committed Dec 31, 2023
2 parents e2ca361 + 8296ec7 commit 1a637ec
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 21 deletions.
18 changes: 6 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: |
Expand All @@ -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

Expand All @@ -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
2 changes: 1 addition & 1 deletion .github/workflows/merge-group-commit-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 3 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion rust-toolchain

This file was deleted.

2 changes: 1 addition & 1 deletion src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
}
Expand Down

0 comments on commit 1a637ec

Please # to comment.