Skip to content

Commit cb5c9b7

Browse files
ci: fix jobs after core workspace refactoring (#3492)
## What ❔ Fix CI jobs after core workspace refactoring: * [x] [Run VM benchmarks](https://github.com/matter-labs/zksync-era/actions/runs/12826132552/job/35765453916?pr=3492) * [x] [Protobuf compatibility](https://github.com/matter-labs/zksync-era/actions/runs/12826132555/job/35765453747?pr=3492) <!-- What are the changes this PR brings about? --> <!-- Example: This PR adds a PR template to the repo. --> <!-- (For bigger PRs adding more context is appreciated) --> ## Checklist <!-- Check your PR fulfills the following items. --> <!-- For draft PRs check the boxes as you complete them. --> - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zkstack dev fmt` and `zkstack dev lint`.
1 parent b50c973 commit cb5c9b7

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.github/workflows/protobuf.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,24 +46,28 @@ jobs:
4646
run:
4747
git checkout $(git merge-base $BASE $HEAD) --recurse-submodules
4848
working-directory: ./before
49+
4950
- name: compile before
5051
run: cargo check --manifest-path ./core/Cargo.toml --all-targets
5152
working-directory: ./before
53+
5254
- name: build before.binpb
5355
run: >
5456
perl -ne 'print "$1\n" if /PROTOBUF_DESCRIPTOR="(.*)"/'
5557
`find ./before/core/target/debug/build/*/output`
56-
| xargs cat > ./before/.binpb
58+
| xargs cat > ./before.binpb
5759
5860
# after
5961
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
6062
with:
6163
ref: ${{ env.HEAD }}
6264
path: after
6365
submodules: recursive
66+
6467
- name: compile after
6568
run: cargo check --manifest-path ./core/Cargo.toml --all-targets
6669
working-directory: ./after
70+
6771
- name: build after.binpb
6872
run: >
6973
perl -ne 'print "$1\n" if /PROTOBUF_DESCRIPTOR="(.*)"/'

.github/workflows/vm-perf-comparison.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
run: |
7070
ci_run zkstackup -g --local
7171
ci_run zkstack dev contracts
72-
ci_run cargo bench --package vm-benchmark --bench instructions -- --verbose
72+
ci_run cargo bench --manifest-path ./core/Cargo.toml --package vm-benchmark --bench instructions -- --verbose
7373
7474
ci_run cargo bench --manifest-path ./core/Cargo.toml \
7575
--package vm-benchmark --bench instructions -- --print > instructions.log 2>/dev/null

.github/workflows/vm-perf-to-prometheus.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ jobs:
4545
4646
- name: run benchmarks
4747
run: |
48-
ci_run cargo bench --package vm-benchmark --bench oneshot
48+
ci_run cargo bench --manifest-path ./core/Cargo.toml --package vm-benchmark --bench oneshot
4949
# Run only benches with 1,000 transactions per batch to not spend too much time
50-
ci_run cargo bench --package vm-benchmark --bench batch '/1000$'
51-
ci_run cargo bench --package vm-benchmark --bench instructions -- --verbose
52-
ci_run cargo bench --package vm-benchmark --bench instructions -- --print
50+
ci_run cargo bench --manifest-path ./core/Cargo.toml --package vm-benchmark --bench batch '/1000$'
51+
ci_run cargo bench --manifest-path ./core/Cargo.toml --package vm-benchmark --bench instructions -- --verbose
52+
ci_run cargo bench --manifest-path ./core/Cargo.toml --package vm-benchmark --bench instructions -- --print

0 commit comments

Comments
 (0)