Skip to content

Commit

Permalink
chore: Update noir (#4168)
Browse files Browse the repository at this point in the history
  • Loading branch information
sirasistant authored Jan 22, 2024
1 parent f0fb594 commit d40ad06
Show file tree
Hide file tree
Showing 94 changed files with 1,237 additions and 2,104 deletions.
2 changes: 1 addition & 1 deletion noir/.github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description: Installs the workspace's yarn dependencies and caches them
runs:
using: composite
steps:
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
id: node
with:
node-version: 18.17.1
Expand Down
2 changes: 1 addition & 1 deletion noir/.github/workflows/docs-dead-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
WORKFLOW_NAME: ${{ github.workflow }}
WORKFLOW_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/job/${{ github.job }}
WORKFLOW_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
with:
update_existing: true
filename: .github/DEAD_LINKS_IN_DOCS.md
52 changes: 34 additions & 18 deletions noir/.github/workflows/docs-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: Check if label is present
id: check-labels
uses: actions/github-script@v3
uses: actions/github-script@v7.0.1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
Expand All @@ -21,10 +21,11 @@ jobs:
}
// Fetch the list of files changed in the PR
const { data: files } = await github.pulls.listFiles({
const { data: files } = await github.rest.pulls.listFiles({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.issue.number
pull_number: context.issue.number,
per_page: 100
});
// Check if any file is within the 'docs' folder
Expand All @@ -33,34 +34,28 @@ jobs:
- name: Add label if not present
if: steps.check-labels.outputs.result == 'true'
uses: actions/github-script@v3
uses: actions/github-script@v7.0.1
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
script: |
const labels = context.payload.pull_request.labels.map(label => label.name);
if (!labels.includes('documentation')) {
github.issues.addLabels({
github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
labels: ['documentation']
})
}
build_and_deploy_preview:
build_preview:
runs-on: ubuntu-latest
permissions:
pull-requests: write
needs: add_label
if: needs.add_label.outputs.has_label == 'true'
steps:
- name: Checkout code
uses: actions/checkout@v4

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

- name: Install wasm-bindgen-cli
uses: taiki-e/install-action@v2
Expand All @@ -71,13 +66,34 @@ jobs:
run: |
npm i wasm-opt -g
- name: Install Yarn dependencies
uses: ./.github/actions/setup

- name: Build docs
run:
yarn workspaces foreach -Rt run build
yarn workspaces foreach -Rpt --from docs run build

- name: Upload artifact
uses: actions/upload-artifact@v3
with:
name: docs
path: ./docs/build/
retention-days: 3


deploy_preview:
needs: [build_preview, add_label]
runs-on: ubuntu-latest
permissions:
pull-requests: write
if: needs.add_label.outputs.has_label == 'true'
steps:
- name: Checkout code
uses: actions/checkout@v4

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

- name: Deploy to Netlify
uses: nwtgck/actions-netlify@v2.1
with:
Expand Down
9 changes: 2 additions & 7 deletions noir/.github/workflows/publish-docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ jobs:
- name: Checkout release branch
uses: actions/checkout@v4

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

- name: Install wasm-bindgen-cli
uses: taiki-e/install-action@v2
Expand All @@ -29,9 +27,6 @@ jobs:
run: |
npm i wasm-opt -g
- name: Install Yarn dependencies
uses: ./.github/actions/setup

- name: Build docs for deploying
working-directory: docs
run:
Expand Down
14 changes: 9 additions & 5 deletions noir/.github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,15 @@ jobs:
run: |
cargo update --workspace
- uses: actions/setup-node@v3
with:
node-version: 18.17.1
cache: 'yarn'
cache-dependency-path: 'yarn.lock'

- name: Update yarn.lock
run: yarn

- name: Configure git
run: |
git config user.name kevaundray
Expand All @@ -68,11 +77,6 @@ jobs:
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

Expand Down
4 changes: 2 additions & 2 deletions noir/.gitrepo
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[subrepo]
remote = https://github.com/noir-lang/noir
branch = aztec-packages
commit = 13f93d523342daf478e08e8ccc0f00962c7fbe05
parent = 41ae75cdee6285729551965972e8cb039ff3045a
commit = 602f23f4fb698cf6e37071936a2a46593a998d08
parent = 7c076653169771223a378f6c01bd9d3e3aafb682
method = merge
cmdver = 0.4.6
4 changes: 2 additions & 2 deletions noir/.release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
".": "0.22.0",
"acvm-repo": "0.38.0"
".": "0.23.0",
"acvm-repo": "0.39.0"
}
Loading

0 comments on commit d40ad06

Please sign in to comment.