Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add a workflow that tracks acvm version for integration tests #2700

Merged
merged 47 commits into from
Sep 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
8839b37
Add a workflow that tracks acvm version
jonybur Sep 14, 2023
9a588d5
Fix workflow
jonybur Sep 14, 2023
1d2d0af
Fetches last commit
jonybur Sep 14, 2023
c3fb341
Test change Cargo.lock version
jonybur Sep 14, 2023
f2c017e
Fix prev acvm version
jonybur Sep 14, 2023
8259cd5
Roll back acvm test value
jonybur Sep 14, 2023
9be0375
Add git update trigger
jonybur Sep 14, 2023
69e0095
Update workflow to skip commits if no changes
jonybur Sep 14, 2023
b1495cf
Use env variables
jonybur Sep 14, 2023
7100ca2
Update acvm version
jonybur Sep 14, 2023
f57d868
Add folder debug info
jonybur Sep 14, 2023
ce206ef
Update acvm version
jonybur Sep 14, 2023
042c90d
Fix path
jonybur Sep 14, 2023
74cd4d1
Update acvm version
jonybur Sep 14, 2023
a57e344
Fix path
jonybur Sep 14, 2023
9f830bf
Fix output name
jonybur Sep 14, 2023
34d9adb
Fix env name
jonybur Sep 14, 2023
68c99f2
Fix git add
jonybur Sep 14, 2023
8594c65
Update ACVM version to
kevaundray Sep 14, 2023
a59f3d5
Fix ACVM version
jonybur Sep 14, 2023
bcf58d2
Fix commit message
jonybur Sep 14, 2023
6cdd80c
Merge branch 'jb-track-acvm-integration-tests' of github.com:noir-lan…
jonybur Sep 14, 2023
cc503da
Update acvm version
jonybur Sep 14, 2023
485a8e3
Update ACVM version to env.acvm_version
kevaundray Sep 14, 2023
4316847
Test out update to acvm
jonybur Sep 14, 2023
090717a
Merge branch 'jb-track-acvm-integration-tests' of github.com:noir-lan…
jonybur Sep 14, 2023
2b0e8ec
Update acvm
jonybur Sep 14, 2023
dfe3737
Update ACVM version to 0.26.5
kevaundray Sep 14, 2023
647eb33
Rollback acvm version
jonybur Sep 14, 2023
4c88e50
Update ACVM version to 0.26.1
kevaundray Sep 14, 2023
c467574
Check ACVM version matches
jonybur Sep 14, 2023
67f2c00
Merge branch 'jb-track-acvm-integration-tests' of github.com:noir-lan…
jonybur Sep 14, 2023
bf4ced5
Remove carat
jonybur Sep 14, 2023
9f73982
Unmatch versions
jonybur Sep 14, 2023
df511f2
Roll back versions
jonybur Sep 14, 2023
324602c
Bump acvm_js
jonybur Sep 14, 2023
cb91567
Edit on push condition
jonybur Sep 14, 2023
678daf4
Update .github/workflows/track-acvm.yml
jonybur Sep 14, 2023
da77579
Restrict to changes to Cargo.lock and yarn.lock
jonybur Sep 14, 2023
c5982f0
Merge branch 'jb-track-acvm-integration-tests' of github.com:noir-lan…
jonybur Sep 14, 2023
706f035
Bump acir (workflow test)
jonybur Sep 14, 2023
c64d541
Revert Cargo.lock
jonybur Sep 14, 2023
059a662
Bump yarn lock (nargo test)
jonybur Sep 15, 2023
be46f96
Revert yarn lock
jonybur Sep 15, 2023
ff8ff34
Update .github/workflows/track-acvm.yml
TomAFrench Sep 15, 2023
64b1114
Merge branch 'master' into jb-track-acvm-integration-tests
TomAFrench Sep 15, 2023
7dab306
chore: bump @aztec/bb.js
TomAFrench Sep 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .github/workflows/track-acvm.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Track ACVM for Integration Tests

on:
pull_request:
paths:
- 'Cargo.lock'
- 'yarn.lock'

jobs:
check_matching_version:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Check acvm version change
run: |
# Extract acvm version from the current Cargo.lock
CURRENT_VERSION=$(awk '/name = "acvm"/ {getline; print $3}' Cargo.lock | tr -d '"')
INTEGRATION_TEST_VERSION=$(yarn workspace integration-tests info @noir-lang/acvm_js --json | jq .children.Version | tr -d '"')

echo "Current ACVM Version: $CURRENT_VERSION"
echo "Integration Test ACVM Version: $INTEGRATION_TEST_VERSION"

if [ "$CURRENT_VERSION" != "$INTEGRATION_TEST_VERSION" ]; then
exit 1
else
echo "ACVM version is a match."
fi
4 changes: 2 additions & 2 deletions compiler/integration-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"test:integration:browser:watch": "web-test-runner test/integration/browser/**/*.test.ts --watch"
},
"dependencies": {
"@aztec/bb.js": "^0.5.1",
"@noir-lang/acvm_js": "^0.26.0",
"@aztec/bb.js": "^0.6.7",
"@noir-lang/acvm_js": "^0.26.1",
"@noir-lang/noir_wasm": "workspace:*",
"@noir-lang/noirc_abi": "workspace:*",
"@noir-lang/source-resolver": "workspace:*",
Expand Down
21 changes: 7 additions & 14 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,17 @@ __metadata:
languageName: node
linkType: hard

"@aztec/bb.js@npm:^0.5.1":
version: 0.5.1
resolution: "@aztec/bb.js@npm:0.5.1"
"@aztec/bb.js@npm:^0.6.7":
version: 0.6.7
resolution: "@aztec/bb.js@npm:0.6.7"
dependencies:
comlink: ^4.4.1
commander: ^10.0.1
debug: ^4.3.4
tslib: ^2.4.0
bin:
bb.js: dest/node/main.js
checksum: 0a191106e6c6eb842181bf856779b2b461136e07a60068b9ae15e9f2e42f993fe4122c343f5946bc16654ef560b227850e8cba3a10c7c3a0a3940d606647f694
checksum: 9067e9c4c5e51de173261bb5feebe6c4f6fc2be0381e2b30301fd5ed6794c5a20f5242427b7701384bc6285cd65e04e2fa914010923d1671cf59c8674b6545eb
languageName: node
linkType: hard

Expand Down Expand Up @@ -385,20 +385,13 @@ __metadata:
languageName: node
linkType: hard

"@noir-lang/acvm_js@npm:0.26.1":
"@noir-lang/acvm_js@npm:0.26.1, @noir-lang/acvm_js@npm:^0.26.1":
version: 0.26.1
resolution: "@noir-lang/acvm_js@npm:0.26.1"
checksum: ae8cb6e31610cd8aa392855342d0c953a1bc4cd9e07236340341afa5815696a69a6635c38241f1d6a5dd30c5a8ae49234f2ba8b71d46c5d1a46756ff6f4dde3a
languageName: node
linkType: hard

"@noir-lang/acvm_js@npm:^0.26.0":
version: 0.26.0
resolution: "@noir-lang/acvm_js@npm:0.26.0"
checksum: 3325b611fec4531363cb67682d50ea40cbeaf8da7672c8373cb11bc7786308a14c61804950b4805e071edc9298005039847621a8d79fae185eda2cf981c64b39
languageName: node
linkType: hard

"@noir-lang/noir_js@workspace:tooling/noir_js":
version: 0.0.0-use.local
resolution: "@noir-lang/noir_js@workspace:tooling/noir_js"
Expand Down Expand Up @@ -4288,8 +4281,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "integration-tests@workspace:compiler/integration-tests"
dependencies:
"@aztec/bb.js": ^0.5.1
"@noir-lang/acvm_js": ^0.26.0
"@aztec/bb.js": ^0.6.7
"@noir-lang/acvm_js": ^0.26.1
"@noir-lang/noir_wasm": "workspace:*"
"@noir-lang/noirc_abi": "workspace:*"
"@noir-lang/source-resolver": "workspace:*"
Expand Down