Skip to content

Commit c383dc8

Browse files
authored
Merge pull request #1548 from o1-labs/dw/fix-build-benches
CI: fix build-benches + add it in the workflow `tests`
2 parents 8f9a1af + a6fd212 commit c383dc8

File tree

4 files changed

+47
-3
lines changed

4 files changed

+47
-3
lines changed

.github/actions/setup-build-deps/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ runs:
1313
shell: bash
1414
run: |
1515
sudo apt update || true
16-
sudo apt install -y protobuf-compiler || true
16+
sudo apt install -y protobuf-compiler libpcap-dev || true
1717
1818
- name: Setup build dependencies (macOS)
1919
if: runner.os == 'macOS'
2020
shell: bash
2121
run: |
22-
brew install protobuf ocaml opam
22+
brew install protobuf ocaml opam libpcap
2323
2424
- name: Install cargo-nextest
2525
if: inputs.install-nextest == 'true'

.github/workflows/lint.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,18 +21,22 @@ jobs:
2121

2222
- name: Setup build dependencies
2323
uses: ./.github/actions/setup-build-deps
24+
2425
- name: Use shared OCaml setting up steps
2526
uses: ./.github/actions/setup-ocaml
2627
with:
2728
ocaml_version: ${{ env.OCAML_VERSION }}
29+
2830
- name: Setup Rust
2931
uses: ./.github/actions/setup-rust
3032
with:
3133
toolchain: ${{ env.RUST_STABLE_VERSION }}
3234
components: clippy, rustfmt
3335
cache-prefix: lint-${{ env.RUST_STABLE_VERSION }}-v0
36+
3437
- name: Run make check
3538
run: make check
39+
3640
- name: Run make lint
3741
run: make lint
3842

@@ -51,16 +55,19 @@ jobs:
5155

5256
- name: Setup build dependencies
5357
uses: ./.github/actions/setup-build-deps
58+
5459
- name: Use shared OCaml setting up steps
5560
uses: ./.github/actions/setup-ocaml
5661
with:
5762
ocaml_version: ${{ env.OCAML_VERSION }}
63+
5864
- name: Setup Rust
5965
uses: ./.github/actions/setup-rust
6066
with:
6167
toolchain: ${{ env.RUST_NIGHTLY_VERSION }}
6268
components: clippy, rustfmt
6369
cache-prefix: lint-tx-fuzzing-${{ env.RUST_NIGHTLY_VERSION }}-v0
70+
6471
- name: Run transaction Fuzzing check
6572
run: make check-tx-fuzzing
6673

@@ -73,10 +80,12 @@ jobs:
7380
os: [ubuntu-24.04]
7481
steps:
7582
- uses: actions/checkout@v5
83+
7684
- name: Install shellcheck
7785
run: |
7886
sudo apt update || true
7987
sudo apt install -y shellcheck || true
88+
8089
- name: Run shellcheck
8190
run: make lint-bash
8291

@@ -89,10 +98,12 @@ jobs:
8998
os: [ubuntu-24.04]
9099
steps:
91100
- uses: actions/checkout@v5
101+
92102
- name: Install hadolint
93103
run: |
94104
wget -O /tmp/hadolint https://github.com/hadolint/hadolint/releases/latest/download/hadolint-Linux-x86_64
95105
chmod +x /tmp/hadolint
96106
sudo mv /tmp/hadolint /usr/local/bin/hadolint
107+
97108
- name: Run hadolint
98109
run: make lint-dockerfiles

.github/workflows/tests.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,36 @@ jobs:
409409
- name: Build WebAssembly node
410410
run: make build-wasm
411411

412+
build-benches:
413+
needs: [build]
414+
timeout-minutes: 60
415+
runs-on: ubuntu-22.04
416+
env:
417+
RUSTFLAGS: "-C overflow-checks=off -C debug-assertions=off ${{ inputs.rustflags }}"
418+
steps:
419+
- name: Git checkout
420+
uses: actions/checkout@v5
421+
422+
- name: Load versions
423+
uses: ./.github/actions/load-versions
424+
425+
- name: Setup build dependencies
426+
uses: ./.github/actions/setup-build-deps
427+
428+
- name: Use shared OCaml setting up steps
429+
uses: ./.github/actions/setup-ocaml
430+
with:
431+
ocaml_version: ${{ env.OCAML_VERSION }}
432+
433+
- name: Setup Rust
434+
uses: ./.github/actions/setup-rust
435+
with:
436+
toolchain: ${{ env.RUST_STABLE_VERSION }}
437+
cache-prefix: build-${{ inputs.os }}-${{ inputs.cache-prefix }}v0
438+
439+
- name: Build benchmarks
440+
run: make build-benches
441+
412442
p2p-scenario-tests:
413443
needs: [build-tests, build-tests-webrtc]
414444
runs-on: ubuntu-24.04

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
140140
reusing build caches for efficiency
141141
([#1539](https://github.com/o1-labs/mina-rust/pull/1539))
142142
- **Ledger**: document, clean and add tests for the crate `mina-tree`
143-
([#1531](https://github.com/o1-labs/mina-rust/pull/1531)).
143+
([#1531](https://github.com/o1-labs/mina-rust/pull/1531).
144144
- **GraphQL**: fixed parsing when neither signature nor proof is given.
145145
See issue [#1464](https://github.com/o1-labs/mina-rust/issues/1464).
146146
Fixed in [#1546](https://github.com/o1-labs/mina-rust/pull/1546/)
@@ -151,6 +151,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
151151
([#1577](https://github.com/o1-labs/mina-rust/pull/1577))
152152
- **tools**: remove producer-dashboard
153153
([#1578](https://github.com/o1-labs/mina-rust/pull/1578))
154+
- **CI**: build benches for each PR with the workflow `tests`, and fix the step
155+
in the workflow `build` by adding the missing SQLx/SQLite setup
156+
([#1548](https://github.com/o1-labs/mina-rust/pull/1548))
154157

155158
### Fixed
156159

0 commit comments

Comments
 (0)