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

feat: Sync from aztec-packages #6808

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .aztec-sync-commit
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fca96007d6055dcf00b72a46630c680fcb6d190d
95eb658f90687c75589b345f95a904d96e2a8e62
27 changes: 27 additions & 0 deletions .github/scripts/merge-bench-reports.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/bash
set -eu

echo "Merging reports"

REPORT_NAME=$1
NAME_PLURAL=""$REPORT_NAME"s"

combined_reports="[]"

# Iterate over each report and merge them
for report in ./reports/*; do
# The report is saved under ./$REPORT_NAME_{ matrix_report }/$REPORT_NAME_{ matrix_report }.json
FILE_PATH=$(echo $(ls $report))

# Extract the $NAME_PLURAL array from each report and merge it
combined_reports=$(jq '[."'"$NAME_PLURAL"'"[]] + '"$combined_reports" <<< "$(cat "$report/$FILE_PATH")")
done

combined_reports=$(jq '[."'$NAME_PLURAL'"[]] + '"$combined_reports" <<< "$(cat ./$REPORT_NAME.json)")

# Wrap the merged memory reports into a new object as to keep the $NAME_PLURAL key
final_report="{\"$NAME_PLURAL\": $combined_reports}"

echo "$final_report" > $REPORT_NAME.json

cat $REPORT_NAME.json
2 changes: 1 addition & 1 deletion .github/workflows/cache-cleanup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:

jobs:
cleanup:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Cleanup
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deny.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ concurrency: deny-${{ github.head_ref || github.run_id }}
jobs:
deny:
name: deny
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v4
- uses: EmbarkStudios/cargo-deny-action@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-dead-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ concurrency:

jobs:
markdown-link-check:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@master
- uses: gaurav-nelson/github-action-markdown-link-check@v1
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/docs-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:

jobs:
add_label:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
outputs:
has_label: ${{ steps.check-labels.outputs.result }}
steps:
Expand Down Expand Up @@ -49,7 +49,7 @@ jobs:
}

build_preview:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:

deploy_preview:
needs: [build_preview, add_label]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
pull-requests: write
if: needs.add_label.outputs.has_label == 'true'
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:

add_comment:
needs: [deploy_preview]
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
permissions:
pull-requests: write
steps:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ concurrency:
jobs:
clippy:
name: cargo clippy
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 30
env:
RUSTFLAGS: -Dwarnings
Expand All @@ -41,7 +41,7 @@ jobs:

rustfmt:
name: cargo fmt
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 30
env:
RUSTFLAGS: -Dwarnings
Expand All @@ -67,7 +67,7 @@ jobs:

eslint:
name: eslint
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 30

steps:
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
nargo_fmt:
needs: [build-nargo]
name: Nargo fmt
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
timeout-minutes: 30

steps:
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 @@ -10,7 +10,7 @@ on:
jobs:
publish:
name: Publish in order
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
publish-docs:
name: Publish docs
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Checkout release branch
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish-es-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ run-name: Publish ES Packages from ${{ inputs.noir-ref }} under @${{ inputs.npm-

jobs:
build-noirc_abi_wasm:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout Noir repo
uses: actions/checkout@v4
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
retention-days: 10

build-noir_wasm:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
retention-days: 3

build-acvm_js:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout sources
uses: actions/checkout@v4
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
retention-days: 3

publish-es-packages:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
needs: [build-acvm_js, build-noirc_abi_wasm, build-noir_wasm]
steps:
- name: Checkout sources
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
dispatch-publish-es:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Dispatch to publish-nargo
uses: benc-uk/workflow-dispatch@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-request-title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ permissions:
jobs:
conventional-title:
name: Validate PR title is Conventional Commit
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Check title
if: github.event_name == 'pull_request_target'
Expand All @@ -30,7 +30,7 @@ jobs:

force-push-comment:
name: Warn external contributors about force-pushing
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
if: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.full_name != 'noir-lang/noir' }}
permissions:
pull-requests: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/recrawler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
jobs:
algolia_recrawl:
name: Algolia Recrawl
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Algolia crawler creation and crawl
uses: algolia/[email protected]
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
outputs:
release-pr: ${{ steps.release.outputs.pr }}
tag-name: ${{ steps.release.outputs.tag_name }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Run release-please
id: release
Expand All @@ -23,7 +23,7 @@ jobs:
name: Update acvm workspace package versions
needs: [release-please]
if: ${{ needs.release-please.outputs.release-pr }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Checkout release branch
uses: actions/checkout@v4
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
name: Update docs
needs: [release-please, update-acvm-workspace-package-versions]
if: ${{ needs.release-please.outputs.release-pr }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Checkout release branch
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:

release-end:
name: Release End
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
# We want this job to always run (even if the dependant jobs fail) as we need apply changes to the sticky comment.
if: ${{ always() }}

Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
name: Build binaries
needs: [release-please]
if: ${{ needs.release-please.outputs.tag-name }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Dispatch to publish workflow
uses: benc-uk/workflow-dispatch@v1
Expand All @@ -160,7 +160,7 @@ jobs:
name: Publish ES packages
needs: [release-please]
if: ${{ needs.release-please.outputs.tag-name }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Dispatch to publish-es-packages
uses: benc-uk/workflow-dispatch@v1
Expand All @@ -174,7 +174,7 @@ jobs:
name: Publish acvm
needs: [release-please]
if: ${{ needs.release-please.outputs.tag-name }}
runs-on: ubuntu-latest
runs-on: ubuntu-22.04

steps:
- name: Dispatch to publish-acvm
Expand Down
Loading
Loading