Skip to content

Commit

Permalink
Merge branch 'master' into gd/signed_cmp
Browse files Browse the repository at this point in the history
  • Loading branch information
kevaundray authored Dec 19, 2023
2 parents 08281ff + decbd0f commit 2e5808e
Show file tree
Hide file tree
Showing 303 changed files with 8,384 additions and 5,104 deletions.
6 changes: 1 addition & 5 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ packages
**/node_modules
**/outputs

# Source resolver
compiler/source-resolver/lib
compiler/source-resolver/lib-node

# Noir.js
tooling/noir_js/lib

Expand All @@ -19,4 +15,4 @@ compiler/wasm/nodejs
compiler/wasm/web
tooling/noirc_abi_wasm/nodejs
tooling/noirc_abi_wasm/web
tooling/noir_js/lib
tooling/noir_js/lib
107 changes: 0 additions & 107 deletions .github/workflows/acir-artifacts.yml

This file was deleted.

6 changes: 0 additions & 6 deletions .github/workflows/publish-acvm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,6 @@ jobs:
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.ACVM_CRATES_IO_TOKEN }}

- name: Publish acvm_stdlib
run: |
cargo publish --package acvm_stdlib
env:
CARGO_REGISTRY_TOKEN: ${{ secrets.ACVM_CRATES_IO_TOKEN }}

- name: Publish brillig_vm
run: |
cargo publish --package brillig_vm
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/publish-nargo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
strategy:
matrix:
target: [x86_64-apple-darwin, aarch64-apple-darwin]
timeout-minutes: 30

steps:
- name: Checkout
Expand Down Expand Up @@ -120,6 +121,7 @@ jobs:
fail-fast: false
matrix:
target: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl]
timeout-minutes: 30

steps:
- name: Checkout
Expand Down
42 changes: 9 additions & 33 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ jobs:
outputs:
release-pr: ${{ steps.release.outputs.pr }}
tag-name: ${{ steps.release.outputs.tag_name }}
pending-release-semver: v${{ steps.release.outputs.major }}.${{steps.release.outputs.minor}}.${{steps.release.outputs.patch}}
runs-on: ubuntu-latest
steps:
- name: Run release-please
Expand Down Expand Up @@ -39,35 +40,9 @@ jobs:
run: |
./scripts/update-acvm-workspace-versions.sh
- name: Configure git
run: |
git config user.name kevaundray
git config user.email [email protected]
- name: Commit updates
run: |
git add Cargo.toml
git commit -m 'chore: Update root workspace acvm versions'
git push
update-lockfile:
name: Update lockfile
needs: [release-please,update-acvm-workspace-package-versions]
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 toolchain
uses: dtolnay/[email protected]

- name: Update lockfile
run: |
cargo update --workspace
cargo update --workspace
- name: Configure git
run: |
Expand All @@ -76,15 +51,16 @@ jobs:
- name: Commit updates
run: |
git add Cargo.lock
git commit -m 'chore: Update lockfile'
git add .
git commit -m 'chore: Update root workspace acvm versions and lockfile'
git push
update-docs:
name: Update docs
needs: [release-please, update-lockfile]
if: ${{ needs.release-please.outputs.tag-name }}
needs: [release-please, update-acvm-workspace-package-versions]
if: ${{ needs.release-please.outputs.release-pr }}
runs-on: ubuntu-latest

steps:
- name: Checkout release branch
uses: actions/checkout@v4
Expand All @@ -102,7 +78,7 @@ jobs:

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

- name: Configure git
run: |
Expand All @@ -112,7 +88,7 @@ jobs:
- 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 commit -m "chore(docs): cut new docs version for tag ${{ needs.release-please.outputs.pending-release-semver }}"
git push
build-binaries:
Expand Down
51 changes: 0 additions & 51 deletions .github/workflows/test-cargo.yml

This file was deleted.

Loading

0 comments on commit 2e5808e

Please sign in to comment.