Skip to content

Commit 363f708

Browse files
roynalnarutoroynalnaruto
committed
should be ok
1 parent 83baeae commit 363f708

File tree

16 files changed

+73
-35
lines changed

16 files changed

+73
-35
lines changed

‎.github/workflows/build-guest.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ on:
66
branches:
77
- master
88
- release/*
9-
# paths:
10-
# - 'crates/circuits/types/**/*'
11-
# - 'crates/circuits/chunk-circuit/**/*'
12-
# - 'crates/circuits/batch-circuit/**/*'
13-
# - 'crates/circuits/bundle-circuit/**/*'
14-
# - 'crates/build-guest/**/*'
9+
paths:
10+
- crates/circuits/types/**/*
11+
- crates/circuits/chunk-circuit/**/*
12+
- crates/circuits/batch-circuit/**/*
13+
- crates/circuits/bundle-circuit/**/*
14+
- crates/build-guest/**/*
1515
push:
1616
branches:
1717
- master
1818
- release/*
19-
# paths:
20-
# - 'crates/circuits/types/**/*'
21-
# - 'crates/circuits/chunk-circuit/**/*'
22-
# - 'crates/circuits/batch-circuit/**/*'
23-
# - 'crates/circuits/bundle-circuit/**/*'
24-
# - 'crates/build-guest/**/*'
19+
paths:
20+
- crates/circuits/types/**/*
21+
- crates/circuits/chunk-circuit/**/*
22+
- crates/circuits/batch-circuit/**/*
23+
- crates/circuits/bundle-circuit/**/*
24+
- crates/build-guest/**/*
2525

2626
jobs:
2727
docker-build-guest:

‎.github/workflows/lint.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
types: [synchronize, opened, reopened, ready_for_review]
66
push:
77
branches:
8-
- 'master'
9-
- 'release/*'
8+
- master
9+
- release/*
1010

1111
env:
1212
CARGO_NET_GIT_FETCH_WITH_CLI: true
@@ -22,8 +22,8 @@ jobs:
2222
uses: fkirc/skip-duplicate-actions@v5
2323
with:
2424
cancel_others: 'true'
25-
concurrent_skipping: 'same_content_newer'
26-
paths_ignore: '["**/README.md"]'
25+
concurrent_skipping: same_content_newer
26+
paths_ignore: ["**/README.md"]
2727

2828
fmt:
2929
needs: [ skip_check ]

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ WORKDIR /app
88

99
COPY . .
1010

11-
CMD [ "sh", "build-guest-actions-entrypoint.sh" ]
11+
ENTRYPOINT ["/app/build-guest-actions-entrypoint.sh"]

‎Makefile‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,22 @@ fmt:
1212

1313
clippy:
1414
@cargo clippy --tests --all-features --manifest-path crates/circuits/types/Cargo.toml -- -D warnings
15-
sh openvm-clippy
16-
@cargo clippy --tests --all-features --manifest-path crates/build-guest/Cargo.toml -- -D warnings
15+
sh openvm-clippy.sh
1716
@cargo clippy --tests --all-features --manifest-path crates/verifier/Cargo.toml -- -D warnings
1817
@cargo clippy --tests --all-features --manifest-path crates/prover/Cargo.toml -- -D warnings
1918
@cargo clippy --tests --all-features --manifest-path crates/integration/Cargo.toml -- -D warnings
19+
@cargo clippy --tests --all-features --manifest-path crates/build-guest/Cargo.toml -- -D warnings
20+
21+
clean-guest:
22+
docker stop build-guest
23+
docker rm build-guest
24+
docker rmi build-guest:local
2025

2126
build-guest:
2227
sh build-guest.sh
2328

29+
clean-build-guest: clean-guest build-guest
30+
2431
test-execute-chunk:
2532
@cargo test --release -p scroll-zkvm-integration --features scroll --test chunk_circuit test_execute -- --exact --nocapture
2633

‎action.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ outputs:
1212
runs:
1313
using: docker
1414
image: Dockerfile
15+
args:
16+
- 'true' # IS_ACTIONS="true"

‎build-guest-actions-entrypoint.sh‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,36 @@
1-
git config --global --add safe.directory $PWD
1+
#!/bin/bash
22

3+
# read arg to know if we are in github actions
4+
IS_ACTIONS=$1
5+
6+
# config to stop dubious ownership warning
7+
if [ "$IS_ACTIONS" = "true" ]; then
8+
echo "github actions running"
9+
git config --global --add safe.directory $PWD
10+
fi
11+
12+
# run crates/build-guest
313
cargo run --release -p scroll-zkvm-build-guest
414

5-
commitments_chunk=$(cat crates/prover/src/commitments/chunk.rs)
6-
commitments_batch=$(cat crates/prover/src/commitments/batch.rs)
7-
commitments_bundle=$(cat crates/prover/src/commitments/bundle.rs)
15+
# set the github actions outputs for the metadata action.yml
16+
if [ "$IS_ACTIONS" = "true" ]; then
17+
echo "github actions running"
18+
19+
{
20+
echo 'commitments-chunk<<EOF'
21+
cat crates/prover/src/commitments/chunk.rs
22+
echo EOF
23+
} >> $GITHUB_OUTPUT
24+
25+
{
26+
echo 'commitments-batch<<EOF'
27+
cat crates/prover/src/commitments/batch.rs
28+
echo EOF
29+
} >> $GITHUB_OUTPUT
830

9-
echo "commitments-chunk=$commitments_chunk" >> $GITHUB_OUTPUT
10-
echo "commitments-batch=$commitments_batch" >> $GITHUB_OUTPUT
11-
echo "commitments-bundle=$commitments_bundle" >> $GITHUB_OUTPUT
31+
{
32+
echo 'commitments-bundle<<EOF'
33+
cat crates/prover/src/commitments/bundle.rs
34+
echo EOF
35+
} >> $GITHUB_OUTPUT
36+
fi

‎build-guest.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1+
#!/bin/bash
2+
13
# build docker image
24
docker build --platform linux/amd64 -t build-guest:local .
35

46
# run docker image
5-
docker run --platform linux/amd64 --name build-guest build-guest:local
7+
docker run --platform linux/amd64 --name build-guest build-guest:local false
68

79
# copy commitments from container to local (prover)
810
docker cp build-guest:/app/crates/prover/src/commitments/chunk.rs crates/prover/src/commitments/chunk.rs

‎crates/circuits/batch-circuit/src/child_commitments.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//! Generated by crates/build-guest. DO NOT OVERWRITE!
22
3-
pub const EXE_COMMIT: [u32; 8] = [1391733106, 921106062, 950136108, 110461137, 1941184241, 1455975835, 1906710701, 1644286022];
3+
pub const EXE_COMMIT: [u32; 8] = [1659950023, 1617184516, 50951008, 1723352697, 979352164, 857305815, 1718381980, 1509836272];
44
pub const LEAF_COMMIT: [u32; 8] = [208617668, 136885539, 1279714325, 1320891327, 319797340, 646564618, 415049183, 43595019];

‎crates/circuits/bundle-circuit/src/child_commitments.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//! Generated by crates/build-guest. DO NOT OVERWRITE!
22
3-
pub const EXE_COMMIT: [u32; 8] = [1824368713, 1134759841, 1595842439, 1703578376, 615548466, 1013310680, 1298821558, 1519746883];
3+
pub const EXE_COMMIT: [u32; 8] = [1132808448, 52725715, 888861123, 495165840, 1023055978, 1273944238, 1322076692, 998330282];
44
pub const LEAF_COMMIT: [u32; 8] = [35464847, 715534820, 120679718, 974048058, 1673548606, 986949435, 942480063, 5326510];

‎crates/prover/src/commitments/batch.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
//! Generated by crates/build-guest. DO NOT OVERWRITE!
22
3-
pub const EXE_COMMIT: [u32; 8] = [1824368713, 1134759841, 1595842439, 1703578376, 615548466, 1013310680, 1298821558, 1519746883];
3+
pub const EXE_COMMIT: [u32; 8] = [1132808448, 52725715, 888861123, 495165840, 1023055978, 1273944238, 1322076692, 998330282];
44
pub const LEAF_COMMIT: [u32; 8] = [35464847, 715534820, 120679718, 974048058, 1673548606, 986949435, 942480063, 5326510];

0 commit comments

Comments
 (0)