Skip to content

Commit

Permalink
Merge branch 'master' into kw/add-casting-to-formatter
Browse files Browse the repository at this point in the history
* master: (21 commits)
  fix: disable modulo for fields (#3009)
  chore: parse fieldless structures (#3021)
  chore: publish to npm nightly (#3029)
  chore(tests): Test trait override of MutableReference of struct (#3011)
  chore: Add a flag to nargo to silence warnings (#3032)
  fix: add `pub` modifier to grumpkin functions (#3036)
  fix: prevent duplicated assert message transformation (#3038)
  chore: make paths in `wasm` tests absolute (#3040)
  fix: include .nr and .sol files in builds (#3039)
  chore: codegen formatter test cases (#3006)
  chore: run tests for `noir_wasm` in node under default resolver (#3020)
  chore: align versions for js packages (#3019)
  fix: Fix aztec library after nargo fmt (#3014)
  chore: simplify ES workspace build and publish (#2989)
  fix: fix method `program_counter`, change method signature (#3012)
  fix: ACIR optimizer should update assertion messages (#3010)
  fix: check for overflow with hexadecimal inputs (#3004)
  feat(traits): Add trait impl for buildin types (#2964)
  feat(traits): added checks for duplicated trait associated items (types, consts, functions) (#2927)
  chore(formatter): trim spaces after opening brace (#3005)
  ...
  • Loading branch information
TomAFrench committed Oct 9, 2023
2 parents a8db779 + 7e68976 commit b40ed73
Show file tree
Hide file tree
Showing 91 changed files with 1,215 additions and 671 deletions.
27 changes: 27 additions & 0 deletions .github/actions/nix/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Setup Nix
description: Installs and setups Nix components

inputs:
github-token:
description: 'Github Access Token'
required: true
nix-cache-name:
description: 'Name of the Cachix cache to use'
required: true
cachix-auth-token:
description: 'Cachix Auth Token'
required: true


runs:
using: composite
steps:
- uses: cachix/install-nix-action@v22
with:
nix_path: nixpkgs=channel:nixos-23.05
github_access_token: ${{ inputs.github-token }}

- uses: cachix/cachix-action@v12
with:
name: ${{ inputs.nix-cache-name }}
authToken: ${{ inputs.cachix-auth-token }}
51 changes: 0 additions & 51 deletions .github/workflows/publish-abi_wasm.yml

This file was deleted.

51 changes: 0 additions & 51 deletions .github/workflows/publish-acvm-js.yml

This file was deleted.

105 changes: 105 additions & 0 deletions .github/workflows/publish-es-packages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
name: Publish Noir ES Packages

on:
workflow_dispatch:
inputs:
noir-ref:
description: The noir reference to checkout
required: false
nightly:
description: Indicates this is a nightly release
required: false
type: boolean
default: true

jobs:
build-noir_wasm:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
with:
ref: ${{ inputs.noir-ref || 'master' }}

- name: Setup Nix
uses: ./.github/actions/nix
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
nix-cache-name: ${{ vars.NIX_CACHE_NAME }}
cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}

- name: Build wasm package
run: |
nix build -L .#noir_wasm
build-noirc_abi_wasm:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
with:
ref: ${{ inputs.noir-ref || 'master' }}

- name: Setup Nix
uses: ./.github/actions/nix
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
nix-cache-name: ${{ vars.NIX_CACHE_NAME }}
cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}

- name: Build wasm package
run: |
nix build -L .#noirc_abi_wasm
build-acvm_js:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
with:
ref: ${{ inputs.noir-ref || 'master' }}

- name: Setup Nix
uses: ./.github/actions/nix
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
nix-cache-name: ${{ vars.NIX_CACHE_NAME }}
cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}

- name: Build wasm package
run: |
nix build -L .#acvm_js
publish-es-packages:
runs-on: ubuntu-latest
needs: [build-acvm_js, build-noirc_abi_wasm, build-noir_wasm]
steps:
- name: Checkout sources
uses: actions/checkout@v4
with:
ref: ${{ inputs.noir-ref || 'master' }}

- name: Setup Nix
uses: ./.github/actions/nix
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
nix-cache-name: ${{ vars.NIX_CACHE_NAME }}
cachix-auth-token: ${{ secrets.CACHIXAUTHTOKEN }}

- name: Install Yarn dependencies
run: yarn install

- name: Build ES Packages
run: yarn prepare:publish

- name: Prepare nightly version
if: ${{ inputs.nightly }}
run: |
sudo apt-get install jq
yarn nightly:version
- name: Authenticate with npm
run: "echo npmAuthToken: ${{ secrets.NPM_TOKEN }} > ~/.yarnrc.yml"

- name: Publish ES Packages
run: yarn publish:all --access public ${{ inputs.nightly && ' --tag nightly' }}
13 changes: 7 additions & 6 deletions .github/workflows/publish-nargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ on:
description: Whether to publish the build artifacts
type: boolean
default: false
schedule:
# Run a nightly release at 2 AM UTC
- cron: "0 2 * * *"
merge_group:
pull_request:

Expand All @@ -29,6 +26,7 @@ jobs:
runs-on: macos-latest
env:
CROSS_CONFIG: ${{ github.workspace }}/.github/Cross.toml
NIGHTLY_RELEASE: ${{ inputs.tag == '' }}
strategy:
matrix:
target: [x86_64-apple-darwin, aarch64-apple-darwin]
Expand Down Expand Up @@ -117,6 +115,7 @@ jobs:
runs-on: ubuntu-22.04
env:
CROSS_CONFIG: ${{ github.workspace }}/.github/Cross.toml
NIGHTLY_RELEASE: ${{ inputs.tag == '' }}
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -172,7 +171,7 @@ jobs:
- name: Upload binaries to release tag
uses: svenstaro/upload-release-action@v2
if: ${{ inputs.publish || github.event_name == 'schedule' }}
if: ${{ inputs.publish }}
with:
repo_name: noir-lang/noir
repo_token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -183,12 +182,12 @@ jobs:

- name: Get formatted date
id: date
if: ${{ inputs.tag == '' && inputs.publish || github.event_name == 'schedule' }}
if: ${{ env.NIGHTLY_RELEASE && inputs.publish }}
run: echo "date=$(date '+%Y-%m-%d')" >> $GITHUB_OUTPUT

- name: Upload binaries to release with date tag
uses: svenstaro/upload-release-action@v2
if: ${{ inputs.tag == '' && inputs.publish || github.event_name == 'schedule' }}
if: ${{ env.NIGHTLY_RELEASE && inputs.publish }}
with:
repo_name: noir-lang/noir
repo_token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -198,3 +197,5 @@ jobs:
make_latest: false
overwrite: true
tag: ${{ format('{0}-{1}', 'nightly', steps.date.outputs.date) }}


26 changes: 26 additions & 0 deletions .github/workflows/publish-nightly.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Publish Nightly release
on:
workflow_dispatch:
schedule:
# Run a nightly release at 2 AM UTC
- cron: "0 2 * * *"

jobs:
dispatch-publish-es:
runs-on: ubuntu-latest
steps:
- name: Dispatch to publish-nargo
uses: benc-uk/workflow-dispatch@v1
with:
workflow: publish-nargo.yml
token: ${{ secrets.NOIR_REPO_TOKEN }}
# Omitting a tag results in a nightly
inputs: "{ \"publish\": true }"


- name: Dispatch to publish-es-packages
uses: benc-uk/workflow-dispatch@v1
with:
workflow: publish-es-packages.yml
token: ${{ secrets.NOIR_REPO_TOKEN }}
inputs: "{ \"noir-ref\": \"${{ env.GITHUB_REF }}\", \"nightly\": true }"
52 changes: 0 additions & 52 deletions .github/workflows/publish-noir-js.yml

This file was deleted.

Loading

0 comments on commit b40ed73

Please sign in to comment.