Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into 7380-nargo-exec-fwd
Browse files Browse the repository at this point in the history
  • Loading branch information
aakoshh committed Feb 26, 2025
2 parents 7f44036 + ef2302b commit 330a07e
Show file tree
Hide file tree
Showing 510 changed files with 24,559 additions and 6,929 deletions.
2 changes: 1 addition & 1 deletion .aztec-sync-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b60a39d989b77702a89ebb24047e5b2419915dc3
f7a65ee697aa7e1a2bbdfcafe9d846aadd9aa2c2
12 changes: 6 additions & 6 deletions .github/benchmark_projects.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
define: &AZ_COMMIT 1350f93c3e9af8f601ca67ca3e67d0127c9767b6
define: &AZ_COMMIT a90f08e245add379fa0257c81f8e2819beb190cb
projects:
private-kernel-inner:
repo: AztecProtocol/aztec-packages
Expand All @@ -7,7 +7,7 @@ projects:
num_runs: 5
compilation-timeout: 2.5
execution-timeout: 0.08
compilation-memory-limit: 300
compilation-memory-limit: 350
execution-memory-limit: 250
private-kernel-tail:
repo: AztecProtocol/aztec-packages
Expand All @@ -18,7 +18,7 @@ projects:
compilation-timeout: 1.2
execution-timeout: 0.02
compilation-memory-limit: 250
execution-memory-limit: 200
execution-memory-limit: 230
private-kernel-reset:
repo: AztecProtocol/aztec-packages
ref: *AZ_COMMIT
Expand Down Expand Up @@ -65,8 +65,8 @@ projects:
cannot_execute: true
num_runs: 1
timeout: 60
compilation-timeout: 100
compilation-memory-limit: 7000
compilation-timeout: 110
compilation-memory-limit: 8000
rollup-block-root:
repo: AztecProtocol/aztec-packages
ref: *AZ_COMMIT
Expand All @@ -75,7 +75,7 @@ projects:
timeout: 60
compilation-timeout: 110
execution-timeout: 40
compilation-memory-limit: 7000
compilation-memory-limit: 8000
execution-memory-limit: 1500
rollup-merge:
repo: AztecProtocol/aztec-packages
Expand Down
4 changes: 2 additions & 2 deletions .github/scripts/wasm-bindgen-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ cd $(dirname "$0")
./cargo-binstall-install.sh

# Install wasm-bindgen-cli.
if [ "$(wasm-bindgen --version &> /dev/null | cut -d' ' -f2)" != "0.2.86" ]; then
if [ "$(wasm-bindgen --version &> /dev/null | cut -d' ' -f2)" != "0.2.100" ]; then
echo "Building wasm-bindgen..."
cargo binstall wasm-bindgen-cli@0.2.86 --force --no-confirm
cargo binstall wasm-bindgen-cli@0.2.100 --force --no-confirm
fi

50 changes: 50 additions & 0 deletions .github/workflows/bump-aztec-packages-commit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Bump external repos pinned commits

on:
workflow_dispatch:
schedule:
# Trigger at 8am on Mondays
- cron: '0 8 * * 1'


jobs:
bump-commit:
name: Update external repo pinned commits
runs-on: ubuntu-22.04
steps:
- name: Checkout repo
uses: actions/checkout@v4
with:
ref: master

- name: Check for existing PR
id: pr-check
run: |
set -xue # print commands
PR_URL=$(gh pr list --repo noir-lang/noir --head bump-aztec-packages --json url --jq ".[0].url")
echo "pr_url=$PR_URL" >> $GITHUB_OUTPUT
env:
GH_TOKEN: ${{ github.token }}

- name: Configure git
run: |
git config user.name noirwhal
git config user.email tomfrench@aztecprotocol.com
- name: Update commit
run: |
git checkout bump-aztec-packages || git checkout -b bump-aztec-packages
./scripts/bump-aztec-packages-commit.sh
git add .
git commit -m 'chore: Update pinned commit of aztec-packages'
git push --set-upstream origin bump-aztec-packages --force
- name: Create PR
if: ${{ steps.pr-check.outputs.pr_url == '' }}
run: |
PR_BODY="""
Automated update of the pinned commit of [aztec-packages](https://github.com/AztecProtocol/aztec-packages) repository against which we run benchmarks.
"""
gh pr create --repo noir-lang/noir --title "chore: bump external pinned commits" --body "$PR_BODY" --base master --head bump-aztec-packages
env:
GH_TOKEN: ${{ secrets.NOIR_REPO_TOKEN }}
10 changes: 5 additions & 5 deletions .github/workflows/docs-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
// Check if any file is within the 'docs' folder
const docsChanged = files.some(file => file.filename.startsWith('docs/'));
return docsChanged;
- name: Add label if not present
if: steps.check-labels.outputs.result == 'true'
uses: actions/github-script@v7.0.1
Expand All @@ -57,7 +57,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.75.0
uses: dtolnay/rust-toolchain@1.85.0

- uses: Swatinem/rust-cache@v2
with:
Expand All @@ -71,7 +71,7 @@ jobs:
- name: Install wasm-bindgen-cli
uses: taiki-e/install-action@v2
with:
tool: wasm-bindgen-cli@0.2.86
tool: wasm-bindgen-cli@0.2.100

- name: Install wasm-opt
run: |
Expand Down Expand Up @@ -102,13 +102,13 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Download built docs
uses: actions/download-artifact@v4
with:
name: docs
path: ./docs/build

- name: Deploy to Netlify
uses: nwtgck/actions-netlify@v2.1
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.75.0
uses: dtolnay/rust-toolchain@1.85.0
with:
targets: x86_64-unknown-linux-gnu
components: clippy, rustfmt
Expand All @@ -51,7 +51,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.75.0
uses: dtolnay/rust-toolchain@1.85.0
with:
targets: x86_64-unknown-linux-gnu
components: clippy, rustfmt
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
uses: actions/checkout@v4

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.75.0
uses: dtolnay/rust-toolchain@1.85.0

- uses: Swatinem/rust-cache@v2
with:
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Download nargo binary
uses: ./.github/actions/download-nargo

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-acvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
ref: ${{ inputs.noir-ref }}

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.75.0
uses: dtolnay/rust-toolchain@1.85.0

# These steps are in a specific order so crate dependencies are updated first
- name: Publish acir_field
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
- name: Install wasm-bindgen-cli
uses: taiki-e/install-action@v2
with:
tool: wasm-bindgen-cli@0.2.86
tool: wasm-bindgen-cli@0.2.100

- name: Install wasm-opt
run: |
npm i wasm-opt -g
- name: Query active docs versions
run: yarn workspace docs version::stables

Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/publish-es-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
uses: actions/checkout@v4
with:
ref: ${{ inputs.noir-ref }}

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.75.0
uses: dtolnay/rust-toolchain@1.85.0

- uses: Swatinem/rust-cache@v2
with:
Expand All @@ -44,7 +44,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: noirc_abi_wasm
path: |
path: |
./tooling/noirc_abi_wasm/nodejs
./tooling/noirc_abi_wasm/web
retention-days: 10
Expand All @@ -58,7 +58,7 @@ jobs:
ref: ${{ inputs.noir-ref }}

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.75.0
uses: dtolnay/rust-toolchain@1.85.0

- uses: Swatinem/rust-cache@v2
with:
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
ref: ${{ inputs.noir-ref }}

- name: Setup toolchain
uses: dtolnay/rust-toolchain@1.75.0
uses: dtolnay/rust-toolchain@1.85.0

- uses: Swatinem/rust-cache@v2
with:
Expand All @@ -119,7 +119,7 @@ jobs:
./acvm-repo/acvm_js/nodejs
./acvm-repo/acvm_js/web
retention-days: 3

publish-es-packages:
runs-on: ubuntu-22.04
needs: [build-acvm_js, build-noirc_abi_wasm, build-noir_wasm]
Expand All @@ -133,12 +133,12 @@ jobs:
with:
name: acvm-js
path: acvm-repo/acvm_js

- uses: actions/download-artifact@v4
with:
name: noir_wasm
path: compiler/wasm

- uses: actions/download-artifact@v4
with:
name: noirc_abi_wasm
Expand Down
Loading

0 comments on commit 330a07e

Please sign in to comment.