Skip to content

Commit a91e5a2

Browse files
authored
chore: consolidate some CI workflows to reduce sprawl (#6696)
1 parent bbe7564 commit a91e5a2

11 files changed

+276
-401
lines changed

.github/workflows/formatting.yml

+26-11
Original file line numberDiff line numberDiff line change
@@ -15,37 +15,53 @@ concurrency:
1515
jobs:
1616
clippy:
1717
name: cargo clippy
18-
runs-on: ${{ matrix.runner }}
18+
runs-on: ubuntu-latest
1919
timeout-minutes: 30
2020
env:
2121
RUSTFLAGS: -Dwarnings
2222

23-
strategy:
24-
fail-fast: false
25-
matrix:
26-
include:
27-
- runner: ubuntu-latest
28-
target: x86_64-unknown-linux-gnu
29-
3023
steps:
3124
- name: Checkout
3225
uses: actions/checkout@v4
3326

3427
- name: Setup toolchain
3528
uses: dtolnay/rust-toolchain@1.74.1
3629
with:
37-
targets: ${{ matrix.target }}
30+
targets: x86_64-unknown-linux-gnu
3831
components: clippy, rustfmt
3932

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

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

42+
rustfmt:
43+
name: cargo fmt
44+
runs-on: ubuntu-latest
45+
timeout-minutes: 30
46+
env:
47+
RUSTFLAGS: -Dwarnings
48+
49+
steps:
50+
- name: Checkout
51+
uses: actions/checkout@v4
52+
53+
- name: Setup toolchain
54+
uses: dtolnay/rust-toolchain@1.74.1
55+
with:
56+
targets: x86_64-unknown-linux-gnu
57+
components: clippy, rustfmt
58+
59+
- uses: Swatinem/rust-cache@v2
60+
with:
61+
key: x86_64-unknown-linux-gnu
62+
cache-on-failure: true
63+
save-if: ${{ github.event_name != 'merge_group' }}
64+
4965
- name: Run `cargo fmt`
5066
run: cargo fmt --all --check
5167

@@ -88,7 +104,6 @@ jobs:
88104
run: |
89105
mkdir dist
90106
cp ./target/release/nargo ./dist/nargo
91-
7z a -ttar -so -an ./dist/* | 7z a -si ./nargo-x86_64-unknown-linux-gnu.tar.gz
92107
93108
- name: Upload artifact
94109
uses: actions/upload-artifact@v4

.github/workflows/gates_report.yml

-94
This file was deleted.

.github/workflows/gates_report_brillig.yml

-92
This file was deleted.

.github/workflows/gates_report_brillig_execution.yml

-92
This file was deleted.

.github/workflows/lockfile.yml

-23
This file was deleted.

0 commit comments

Comments
 (0)