Skip to content

Commit

Permalink
chore: consolidate some CI workflows to reduce sprawl (#6696)
Browse files Browse the repository at this point in the history
  • Loading branch information
TomAFrench authored Dec 4, 2024
1 parent bbe7564 commit a91e5a2
Show file tree
Hide file tree
Showing 11 changed files with 276 additions and 401 deletions.
37 changes: 26 additions & 11 deletions .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,37 +15,53 @@ concurrency:
jobs:
clippy:
name: cargo clippy
runs-on: ${{ matrix.runner }}
runs-on: ubuntu-latest
timeout-minutes: 30
env:
RUSTFLAGS: -Dwarnings

strategy:
fail-fast: false
matrix:
include:
- runner: ubuntu-latest
target: x86_64-unknown-linux-gnu

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.74.1
with:
targets: ${{ matrix.target }}
targets: x86_64-unknown-linux-gnu
components: clippy, rustfmt

- uses: Swatinem/rust-cache@v2
with:
key: ${{ matrix.target }}
key: x86_64-unknown-linux-gnu
cache-on-failure: true
save-if: ${{ github.event_name != 'merge_group' }}

- name: Run `cargo clippy`
run: cargo clippy --all-targets --workspace --locked --release

rustfmt:
name: cargo fmt
runs-on: ubuntu-latest
timeout-minutes: 30
env:
RUSTFLAGS: -Dwarnings

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.74.1
with:
targets: x86_64-unknown-linux-gnu
components: clippy, rustfmt

- uses: Swatinem/rust-cache@v2
with:
key: x86_64-unknown-linux-gnu
cache-on-failure: true
save-if: ${{ github.event_name != 'merge_group' }}

- name: Run `cargo fmt`
run: cargo fmt --all --check

Expand Down Expand Up @@ -88,7 +104,6 @@ jobs:
run: |
mkdir dist
cp ./target/release/nargo ./dist/nargo
7z a -ttar -so -an ./dist/* | 7z a -si ./nargo-x86_64-unknown-linux-gnu.tar.gz
- name: Upload artifact
uses: actions/upload-artifact@v4
Expand Down
94 changes: 0 additions & 94 deletions .github/workflows/gates_report.yml

This file was deleted.

92 changes: 0 additions & 92 deletions .github/workflows/gates_report_brillig.yml

This file was deleted.

92 changes: 0 additions & 92 deletions .github/workflows/gates_report_brillig_execution.yml

This file was deleted.

23 changes: 0 additions & 23 deletions .github/workflows/lockfile.yml

This file was deleted.

Loading

0 comments on commit a91e5a2

Please sign in to comment.