Skip to content

Commit

Permalink
Merge branch 'main' into banjofox/refactor-aardwolf-actix
Browse files Browse the repository at this point in the history
  • Loading branch information
BanjoFox committed Jul 3, 2024
2 parents 3b80af3 + 7161111 commit 8f8bc09
Show file tree
Hide file tree
Showing 13 changed files with 458 additions and 120 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/aardwolf-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,25 @@ concurrency:
cancel-in-progress: true

jobs:

cargo-build:
runs-on: ubuntu-latest

steps:

- name: Checkout
uses: actions/checkout@v3.5.3
uses: actions/checkout@v4 # Marketplace - https://github.com/marketplace/actions/checkout
# Installs the most recent stable rust toolchain as of the specified time
# offset, which may be written in years, months, weeks, or days.
- uses: dtolnay/rust-toolchain@master

- name: Install rust toolchain
uses: dtolnay/rust-toolchain@master
with:
toolchain: stable
components: rustfmt, clippy

- name: Cache dependencies
uses: actions/cache@v3.3.1
uses: actions/cache@v4
with:
path: ~/.cargo
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
Expand Down Expand Up @@ -68,4 +71,4 @@ jobs:
# Run cargo build
- name: Cargo build aardwolf
run: cargo build
run: cargo build
4 changes: 2 additions & 2 deletions .github/workflows/aardwolf-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ jobs:
runs-on: ubuntu-latest
steps:
# Checkout the originating branch
- uses: actions/checkout@v3.5.3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.workflow_run.head_branch }}

# Cache dependencies
- name: Cache dependencies
uses: actions/cache@v3.3.1
uses: actions/cache@v4
with:
path: ~/.cargo
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/rust-clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,11 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4 # Marketplace - https://github.com/marketplace/actions/checkout

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1 # Marketplace - https://github.com/marketplace/actions/rust-toolchain
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@master # Marketplace - https://github.com/marketplace/actions/rustup-toolchain-install
with:
profile: minimal
toolchain: stable
components: clippy
override: true
components: rustfmt, clippy

- name: Install required cargo
run: cargo install clippy-sarif sarif-fmt
Expand Down
Loading

0 comments on commit 8f8bc09

Please sign in to comment.