Skip to content

Commit

Permalink
Merge branch 'master' into gd/databus
Browse files Browse the repository at this point in the history
* master: (28 commits)
  feat: reuse witnesses more when interacting with memory (#3658)
  chore(ci): stop committing new acir artifacts (#3654)
  chore: add env var for test updates in nargo_fmt (#3638)
  chore: remove unnecessary conversions from `add_constant` (#3651)
  feat: Complex slice inputs for dynamic slice builtins (#3617)
  feat: Add `FieldElement::from<usize>` implementation (#3647)
  chore: fix relative paths in reease please (#3646)
  chore: add integration test for verifying a recursive proof onchain (#3167)
  chore: adding docs to release please (#3571)
  chore(ci): Fix publishing of ACVM crates (#3645)
  chore(docs): address visibility issues in docs (#3643)
  chore: type formatting (#3618)
  fix: Restrict fill_internal_slices pass to acir functions (#3634)
  chore(docs): docs for v0.19.4 (#3601)
  feat: aztec-packages (#3626)
  chore: Move tests to the correct root (#3633)
  feat: Implement integer printing (#3577)
  fix: corrected the formatting of error message parameters in index out of bounds error (#3630)
  chore: Update ACIR artifacts (#3619)
  chore(debugger): Run debugger REPL in thread (#3611)
  ...
  • Loading branch information
TomAFrench committed Dec 1, 2023
2 parents e2278b7 + 5a4a73d commit 840fde8
Show file tree
Hide file tree
Showing 457 changed files with 9,714 additions and 1,892 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Rebuild ACIR artifacts
name: Build ACIR artifacts

on:
pull_request:
Expand Down Expand Up @@ -93,11 +93,6 @@ jobs:
chmod +x ${{ github.workspace }}/nargo/nargo
echo "${{ github.workspace }}/nargo" >> $GITHUB_PATH
- name: Set up Git user (Github Action)
run: |
git config --local user.name kevaundray
git config --local user.email kevtheappdev@gmail.com
- name: Run rebuild script
working-directory: test_programs
run: |
Expand All @@ -110,21 +105,3 @@ jobs:
name: acir-artifacts
path: ./test_programs/acir_artifacts
retention-days: 10

- name: Check for changes in acir_artifacts directory
id: check_changes
if: ${{ github.ref_name }} == "master"
run: |
git diff --quiet test_programs/acir_artifacts/ || echo "::set-output name=changes::true"
- name: Create or Update PR
if: steps.check_changes.outputs.changes == 'true'
uses: peter-evans/create-pull-request@v3
with:
token: ${{ secrets.NOIR_REPO_TOKEN }}
commit-message: "chore: update acir artifacts"
title: "chore: Update ACIR artifacts"
body: "Automatic PR to update acir artifacts"
add-paths: test_programs/acir_artifacts/*.gz
labels: "auto-pr"
branch: "auto-pr-rebuild-script-branch"
112 changes: 0 additions & 112 deletions .github/workflows/docs-new-version.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .github/workflows/docs-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,6 @@ jobs:
- name: Install Yarn dependencies
uses: ./.github/actions/setup

- name: Remove pre-releases
working-directory: docs
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: yarn setStable

- name: Build docs
working-directory: docs
run:
Expand Down
72 changes: 0 additions & 72 deletions .github/workflows/docs-release.yml

This file was deleted.

57 changes: 57 additions & 0 deletions .github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Publish documentation

on:
workflow_dispatch:
inputs:
noir-ref:
description: The noir reference to checkout
required: false
default: 'master'

jobs:
publish-docs:
name: Publish docs
runs-on: ubuntu-latest

steps:
- name: Checkout release branch
uses: actions/checkout@v4
with:
ref: ${{ inputs.noir-ref }}
token: ${{ secrets.NOIR_RELEASES_TOKEN }}

- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: '18'

- name: Install wasm-bindgen-cli
uses: taiki-e/install-action@v2
with:
tool: wasm-bindgen-cli@0.2.86

- name: Install wasm-opt
run: |
npm i wasm-opt -g
- name: Install Yarn dependencies
uses: ./.github/actions/setup

- name: Build docs for deploying
working-directory: docs
run:
yarn workspaces foreach -Rt run build

- name: Deploy to Netlify
uses: nwtgck/actions-netlify@v2.1
with:
publish-dir: './docs/build'
production-branch: master
production-deploy: true
github-token: ${{ secrets.GITHUB_TOKEN }}
enable-github-deployment: false
deploy-message: "Deploy from GitHub Actions for tag ${{ inputs.noir-ref }}"
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
timeout-minutes: 1
47 changes: 41 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,42 @@ jobs:
git commit -m 'chore: Update lockfile'
git push
update-docs:
name: Update docs
needs: [release-please, update-lockfile]
if: ${{ needs.release-please.outputs.release-pr }}
runs-on: ubuntu-latest
steps:
- name: Checkout release branch
uses: actions/checkout@v4
with:
ref: ${{ fromJSON(needs.release-please.outputs.release-pr).headBranchName }}
token: ${{ secrets.NOIR_RELEASES_TOKEN }}

- name: Setup Node.js
uses: actions/setup-node@v2
with:
node-version: '18'

- name: Install Yarn dependencies
uses: ./.github/actions/setup

- name: Cut a new version
working-directory: ./docs
run: yarn docusaurus docs:version ${{ needs.release-please.outputs.tag-name }}

- name: Configure git
run: |
git config --local user.name 'signorecello'
git config --local user.email 'github@zepedro.me'
- name: Commit new documentation version
run: |
git add .
git commit -m "chore(docs): cut new docs version for tag ${{ needs.release-please.outputs.tag-name }}"
git push
build-binaries:
name: Build binaries
needs: [release-please]
Expand Down Expand Up @@ -78,19 +114,18 @@ jobs:
ref: master
token: ${{ secrets.NOIR_REPO_TOKEN }}
inputs: '{ "noir-ref": "${{ needs.release-please.outputs.tag-name }}", "npm-tag": "latest" }'


publish-docs:
name: Publish docs
needs: [release-please]
if: ${{ needs.release-please.outputs.tag-name }}
runs-on: ubuntu-latest

steps:
- name: Dispatch to publish workflow
- name: Dispatch to publish-docs
uses: benc-uk/workflow-dispatch@v1
with:
workflow: docs-new-version.yml
repo: noir-lang/noir
workflow: publish-docs.yml
ref: master
token: ${{ secrets.GITHUB_TOKEN }}
inputs: '{ "tag": "${{ needs.release-please.outputs.tag-name }}"}'
token: ${{ secrets.NOIR_REPO_TOKEN }}
inputs: '{ "noir-ref": "${{ needs.release-please.outputs.tag-name }}" }'
16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,14 @@ repository = "https://github.com/noir-lang/noir/"
[workspace.dependencies]

# ACVM workspace dependencies
acir = { path = "acvm-repo/acir", default-features = false }
acvm = { path = "acvm-repo/acvm" }
acir_field = { path = "acvm-repo/acir_field", default-features = false }
stdlib = { package = "acvm_stdlib", path = "acvm-repo/stdlib", default-features = false }
brillig = { path = "acvm-repo/brillig", default-features = false }
brillig_vm = { path = "acvm-repo/brillig_vm", default-features = false }
acvm_blackbox_solver = { path = "acvm-repo/blackbox_solver", default-features = false }
barretenberg_blackbox_solver = { path = "acvm-repo/barretenberg_blackbox_solver", default-features = false }
acir_field = { version = "0.35.0", path = "acvm-repo/acir_field", default-features = false }
acir = { version = "0.35.0", path = "acvm-repo/acir", default-features = false }
acvm = { version = "0.35.0", path = "acvm-repo/acvm" }
stdlib = { version = "0.35.0", package = "acvm_stdlib", path = "acvm-repo/stdlib", default-features = false }
brillig = { version = "0.35.0", path = "acvm-repo/brillig", default-features = false }
brillig_vm = { version = "0.35.0", path = "acvm-repo/brillig_vm", default-features = false }
acvm_blackbox_solver = { version = "0.35.0", path = "acvm-repo/blackbox_solver", default-features = false }
barretenberg_blackbox_solver = { version = "0.35.0", path = "acvm-repo/barretenberg_blackbox_solver", default-features = false }

# Noir compiler workspace dependencies
arena = { path = "compiler/utils/arena" }
Expand Down
Loading

0 comments on commit 840fde8

Please sign in to comment.