From 129bee79684f3cd1c2b476d4e4b02e79ea034bc8 Mon Sep 17 00:00:00 2001 From: Jonathan Bursztyn Date: Sun, 1 Oct 2023 23:40:05 -0400 Subject: [PATCH 01/12] Fix multiple publishing workflows --- .github/workflows/publish-abi_wasm.yml | 13 +++++---- .github/workflows/publish-acvm-js.yml | 14 ++++++---- .github/workflows/publish-noir-js.yml | 14 ++++++++-- .github/workflows/publish-noir-wasm.yml | 28 ++++++++++++------- .github/workflows/publish-source-resolver.yml | 12 +++++++- flake.lock | 8 +++--- flake.nix | 2 +- 7 files changed, 61 insertions(+), 30 deletions(-) diff --git a/.github/workflows/publish-abi_wasm.yml b/.github/workflows/publish-abi_wasm.yml index feca0e58ff8..dfcaafa010e 100644 --- a/.github/workflows/publish-abi_wasm.yml +++ b/.github/workflows/publish-abi_wasm.yml @@ -6,6 +6,9 @@ on: noir-ref: description: The noir reference to checkout required: true + push: + branches: + - jb-fix-publishing-workflows jobs: noirc-abi-wasm-build: @@ -32,8 +35,7 @@ jobs: github_access_token: ${{ secrets.GITHUB_TOKEN }} - name: Build noirc_abi_wasm - run: | - nix build -L .#noirc_abi_wasm + run: nix build .#noirc_abi_wasm - name: Discover Build Output Path run: echo "BUILD_OUTPUT_PATH=$(readlink -f ./result/noirc_abi_wasm)" >> $GITHUB_ENV @@ -42,10 +44,11 @@ jobs: run: | mkdir temp_publish_dir cp -r ${{ env.BUILD_OUTPUT_PATH }}/* temp_publish_dir/ + touch temp_publish_dir/yarn.lock - - name: Publish to npm + - name: Publish to NPM working-directory: ./temp_publish_dir - run: | - yarn npm publish --tag latest + # run: yarn npm publish --tag latest + run: yarn pack --dry-run env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/publish-acvm-js.yml b/.github/workflows/publish-acvm-js.yml index b2145085a02..3c14cc4896a 100644 --- a/.github/workflows/publish-acvm-js.yml +++ b/.github/workflows/publish-acvm-js.yml @@ -6,6 +6,9 @@ on: acvm-ref: description: The acvm reference to checkout required: true + push: + branches: + - jb-fix-publishing-workflows jobs: publish-acvm-js-package: @@ -33,22 +36,21 @@ jobs: authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: Build acvm-js - working-directory: acvm-repo run: | - nix build .# + nix build .#acvm_js - name: Discover Build Output Path - working-directory: acvm-repo run: echo "BUILD_OUTPUT_PATH=$(readlink -f ./result)" >> $GITHUB_ENV - name: Copy Build Output to Temporary Directory - working-directory: acvm-repo run: | mkdir temp_publish_dir cp -r ${{ env.BUILD_OUTPUT_PATH }}/* temp_publish_dir/ + touch temp_publish_dir/yarn.lock - name: Publish to NPM - working-directory: ./acvm-repo/temp_publish_dir - run: npm publish + working-directory: ./temp_publish_dir + # run: yarn npm publish --tag latest + run: yarn pack --dry-run env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/publish-noir-js.yml b/.github/workflows/publish-noir-js.yml index 4614390e053..018a6feec9f 100644 --- a/.github/workflows/publish-noir-js.yml +++ b/.github/workflows/publish-noir-js.yml @@ -1,7 +1,10 @@ -name: Release and Publish Noir Js +name: Publish Noir Js on: workflow_dispatch: + push: + branches: + - jb-fix-publishing-workflows jobs: release-noir-js: @@ -17,9 +20,13 @@ jobs: - name: Install jq run: sudo apt-get install jq + - name: Setup toolchain + uses: dtolnay/rust-toolchain@master + with: + toolchain: 1.67.0 + - name: Install cargo and wasm-bindgen run: | - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y source $HOME/.cargo/env cargo install -f wasm-bindgen-cli --version 0.2.86 @@ -42,6 +49,7 @@ jobs: - name: Publish to NPM working-directory: ./tooling/noir_js - run: yarn npm publish --access public + # run: yarn npm publish --access public + run: yarn pack --dry-run env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/publish-noir-wasm.yml b/.github/workflows/publish-noir-wasm.yml index d862ad6993a..14df2f9daf0 100644 --- a/.github/workflows/publish-noir-wasm.yml +++ b/.github/workflows/publish-noir-wasm.yml @@ -1,7 +1,10 @@ -name: Release Noir Wasm +name: Publish Noir Wasm on: workflow_dispatch: + push: + branches: + - jb-fix-publishing-workflows jobs: publish-noir-wasm: @@ -26,18 +29,23 @@ jobs: nix_path: nixpkgs=channel:nixos-23.05 - name: Build with Nix - run: | - nix build -L .#wasm + run: nix build .#noir_wasm + + - name: Discover Build Output Path + run: echo "BUILD_OUTPUT_PATH=$(readlink -f ./result)" >> $GITHUB_ENV - - name: Copy output + - name: Copy Build Output to Temporary Directory run: | - cp -r $(readlink result)/* . - + mkdir temp_publish_dir + cp -r ${{ env.BUILD_OUTPUT_PATH }}/* temp_publish_dir/ + touch temp_publish_dir/yarn.lock + - name: Authenticate with npm run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc - - name: Publish to npm - run: | - npm publish --access public + - name: Publish to NPM + working-directory: ./temp_publish_dir + # run: yarn npm publish --tag latest + run: yarn pack --dry-run env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} \ No newline at end of file + NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/publish-source-resolver.yml b/.github/workflows/publish-source-resolver.yml index f1f7574cc2b..5df24b14847 100644 --- a/.github/workflows/publish-source-resolver.yml +++ b/.github/workflows/publish-source-resolver.yml @@ -2,6 +2,9 @@ name: Publish Source Resolver on: workflow_dispatch: + push: + branches: + - jb-fix-publishing-workflows jobs: release-source-resolver: @@ -11,6 +14,12 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Setup Node.js + uses: actions/setup-node@v3 + with: + registry-url: "https://registry.npmjs.org" + node-version: 18.15 + - name: Install dependencies run: yarn install --immutable @@ -19,6 +28,7 @@ jobs: - name: Publish to NPM working-directory: ./compiler/source-resolver - run: yarn npm publish + # run: yarn npm publish + run: yarn pack --dry-run env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/flake.lock b/flake.lock index e779473f0ec..7877bec612f 100644 --- a/flake.lock +++ b/flake.lock @@ -84,16 +84,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1681269223, - "narHash": "sha256-i6OeI2f7qGvmLfD07l1Az5iBL+bFeP0RHixisWtpUGo=", + "lastModified": 1696039360, + "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "87edbd74246ccdfa64503f334ed86fa04010bab9", + "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-22.11", + "ref": "nixos-23.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 9b3d22b8167..6962c1973be 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ # use so they use the `inputs.*.follows` syntax to reference our inputs inputs = { nixpkgs = { - url = "github:NixOS/nixpkgs/nixos-22.11"; + url = "github:NixOS/nixpkgs/nixos-23.05"; }; flake-utils = { From 8f29a927f30dd634031df475d4fd0bfd6fdacd86 Mon Sep 17 00:00:00 2001 From: Jonathan Bursztyn Date: Sun, 1 Oct 2023 23:46:35 -0400 Subject: [PATCH 02/12] Roll back nix update --- flake.lock | 8 ++++---- flake.nix | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 7877bec612f..e779473f0ec 100644 --- a/flake.lock +++ b/flake.lock @@ -84,16 +84,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1696039360, - "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=", + "lastModified": 1681269223, + "narHash": "sha256-i6OeI2f7qGvmLfD07l1Az5iBL+bFeP0RHixisWtpUGo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc", + "rev": "87edbd74246ccdfa64503f334ed86fa04010bab9", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-22.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 6962c1973be..9b3d22b8167 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ # use so they use the `inputs.*.follows` syntax to reference our inputs inputs = { nixpkgs = { - url = "github:NixOS/nixpkgs/nixos-23.05"; + url = "github:NixOS/nixpkgs/nixos-22.11"; }; flake-utils = { From def3461a9a83542a1388531f88914f81de051119 Mon Sep 17 00:00:00 2001 From: Jonathan Bursztyn Date: Mon, 2 Oct 2023 00:03:49 -0400 Subject: [PATCH 03/12] Bump toolchain, mini refactors --- .github/workflows/publish-acvm-js.yml | 7 +++---- .github/workflows/test-noir-js.yml | 2 +- rust-toolchain.toml | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/publish-acvm-js.yml b/.github/workflows/publish-acvm-js.yml index 3c14cc4896a..2412d23c857 100644 --- a/.github/workflows/publish-acvm-js.yml +++ b/.github/workflows/publish-acvm-js.yml @@ -1,4 +1,4 @@ -name: Publish acvm_js +name: Publish acvm-js on: workflow_dispatch: @@ -36,8 +36,7 @@ jobs: authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: Build acvm-js - run: | - nix build .#acvm_js + run: nix build .#acvm_js - name: Discover Build Output Path run: echo "BUILD_OUTPUT_PATH=$(readlink -f ./result)" >> $GITHUB_ENV @@ -49,7 +48,7 @@ jobs: touch temp_publish_dir/yarn.lock - name: Publish to NPM - working-directory: ./temp_publish_dir + working-directory: ./temp_publish_dir/acvm_js # run: yarn npm publish --tag latest run: yarn pack --dry-run env: diff --git a/.github/workflows/test-noir-js.yml b/.github/workflows/test-noir-js.yml index 1dac0200027..8c2470bf541 100644 --- a/.github/workflows/test-noir-js.yml +++ b/.github/workflows/test-noir-js.yml @@ -1,4 +1,4 @@ -name: Noir JS +name: Test Noir Js on: pull_request: diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 63f41db96a1..c0185fffbfb 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.66.1" +channel = "1.67.0" components = [ "rust-src" ] targets = [ "wasm32-unknown-unknown", "wasm32-wasi", "aarch64-apple-darwin" ] profile = "default" From ff59c3112d25cdffd9985dc8a19879e682e66473 Mon Sep 17 00:00:00 2001 From: Jonathan Bursztyn Date: Mon, 2 Oct 2023 00:07:28 -0400 Subject: [PATCH 04/12] Fix sha --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 9b3d22b8167..541997eab39 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,7 @@ rustToolchain = fenix.packages.${system}.fromToolchainFile { file = ./rust-toolchain.toml; - sha256 = "sha256-Zk2rxv6vwKFkTTidgjPm6gDsseVmmljVt201H7zuDkk="; + sha256 = "sha256-riZUc+R9V35c/9e8KJUE+8pzpXyl0lRXt3ZkKlxoY0g="; }; craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain; From 3636641c989aa15e1736624a13bdba941754c7b7 Mon Sep 17 00:00:00 2001 From: Jonathan Bursztyn Date: Mon, 2 Oct 2023 00:29:46 -0400 Subject: [PATCH 05/12] Build acvm_js for noir_js --- .github/workflows/publish-noir-js.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/publish-noir-js.yml b/.github/workflows/publish-noir-js.yml index 018a6feec9f..e2ca08711ce 100644 --- a/.github/workflows/publish-noir-js.yml +++ b/.github/workflows/publish-noir-js.yml @@ -41,6 +41,9 @@ jobs: - name: Build noirc_abi run: yarn workspace @noir-lang/noirc_abi build + - name: Build acvm_js + run: yarn workspace @noir-lang/acvm_js build + - name: Build noir_js run: yarn workspace @noir-lang/noir_js build From db5275a369d1826d75f10762b2d669b437ad389c Mon Sep 17 00:00:00 2001 From: Jonathan Bursztyn Date: Mon, 2 Oct 2023 00:36:03 -0400 Subject: [PATCH 06/12] Fix working directory for npm publish --- .github/workflows/publish-acvm-js.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish-acvm-js.yml b/.github/workflows/publish-acvm-js.yml index 2412d23c857..0b520da32e8 100644 --- a/.github/workflows/publish-acvm-js.yml +++ b/.github/workflows/publish-acvm-js.yml @@ -47,8 +47,12 @@ jobs: cp -r ${{ env.BUILD_OUTPUT_PATH }}/* temp_publish_dir/ touch temp_publish_dir/yarn.lock + - name: Log out debug info + working-directory: ./temp_publish_dir + run: ls -R + - name: Publish to NPM - working-directory: ./temp_publish_dir/acvm_js + working-directory: ./temp_publish_dir # run: yarn npm publish --tag latest run: yarn pack --dry-run env: From a6e96700a60cebbf69d3791d0f2fd434e0f3f850 Mon Sep 17 00:00:00 2001 From: Jonathan Bursztyn Date: Mon, 2 Oct 2023 00:48:25 -0400 Subject: [PATCH 07/12] Unify package publishing --- .github/workflows/publish-abi_wasm.yml | 6 +++--- .github/workflows/publish-acvm-js.yml | 8 ++------ .github/workflows/publish-noir-wasm.yml | 10 +++++----- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.github/workflows/publish-abi_wasm.yml b/.github/workflows/publish-abi_wasm.yml index dfcaafa010e..716dfe35695 100644 --- a/.github/workflows/publish-abi_wasm.yml +++ b/.github/workflows/publish-abi_wasm.yml @@ -38,16 +38,16 @@ jobs: run: nix build .#noirc_abi_wasm - name: Discover Build Output Path - run: echo "BUILD_OUTPUT_PATH=$(readlink -f ./result/noirc_abi_wasm)" >> $GITHUB_ENV + run: echo "BUILD_OUTPUT_PATH=$(readlink -f ./result)" >> $GITHUB_ENV - name: Copy Build Output to Temporary Directory run: | mkdir temp_publish_dir cp -r ${{ env.BUILD_OUTPUT_PATH }}/* temp_publish_dir/ - touch temp_publish_dir/yarn.lock + touch temp_publish_dir/noirc_abi_wasm/yarn.lock - name: Publish to NPM - working-directory: ./temp_publish_dir + working-directory: ./temp_publish_dir/noirc_abi_wasm # run: yarn npm publish --tag latest run: yarn pack --dry-run env: diff --git a/.github/workflows/publish-acvm-js.yml b/.github/workflows/publish-acvm-js.yml index 0b520da32e8..328599383ab 100644 --- a/.github/workflows/publish-acvm-js.yml +++ b/.github/workflows/publish-acvm-js.yml @@ -45,14 +45,10 @@ jobs: run: | mkdir temp_publish_dir cp -r ${{ env.BUILD_OUTPUT_PATH }}/* temp_publish_dir/ - touch temp_publish_dir/yarn.lock - - - name: Log out debug info - working-directory: ./temp_publish_dir - run: ls -R + touch temp_publish_dir/acvm_js/yarn.lock - name: Publish to NPM - working-directory: ./temp_publish_dir + working-directory: ./temp_publish_dir/acvm_js # run: yarn npm publish --tag latest run: yarn pack --dry-run env: diff --git a/.github/workflows/publish-noir-wasm.yml b/.github/workflows/publish-noir-wasm.yml index 14df2f9daf0..07edcc07802 100644 --- a/.github/workflows/publish-noir-wasm.yml +++ b/.github/workflows/publish-noir-wasm.yml @@ -24,6 +24,9 @@ jobs: target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + - name: Authenticate with npm + run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc + - uses: cachix/install-nix-action@v22 with: nix_path: nixpkgs=channel:nixos-23.05 @@ -38,13 +41,10 @@ jobs: run: | mkdir temp_publish_dir cp -r ${{ env.BUILD_OUTPUT_PATH }}/* temp_publish_dir/ - touch temp_publish_dir/yarn.lock - - - name: Authenticate with npm - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc + touch temp_publish_dir/noir_wasm/yarn.lock - name: Publish to NPM - working-directory: ./temp_publish_dir + working-directory: ./temp_publish_dir/noir_wasm # run: yarn npm publish --tag latest run: yarn pack --dry-run env: From e3d5b3870a2a6f31cf7cd1ff298a72308ae2b6e5 Mon Sep 17 00:00:00 2001 From: Jonathan Bursztyn Date: Mon, 2 Oct 2023 00:58:45 -0400 Subject: [PATCH 08/12] Refactor --- .github/workflows/publish-abi_wasm.yml | 7 ++++--- .github/workflows/publish-acvm-js.yml | 8 ++++---- .github/workflows/publish-noir-wasm.yml | 6 +++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/publish-abi_wasm.yml b/.github/workflows/publish-abi_wasm.yml index 716dfe35695..fe8696f86d1 100644 --- a/.github/workflows/publish-abi_wasm.yml +++ b/.github/workflows/publish-abi_wasm.yml @@ -38,17 +38,18 @@ jobs: run: nix build .#noirc_abi_wasm - name: Discover Build Output Path - run: echo "BUILD_OUTPUT_PATH=$(readlink -f ./result)" >> $GITHUB_ENV + run: echo "BUILD_OUTPUT_PATH=$(readlink -f ./result/noirc_abi_wasm)" >> $GITHUB_ENV - name: Copy Build Output to Temporary Directory run: | mkdir temp_publish_dir cp -r ${{ env.BUILD_OUTPUT_PATH }}/* temp_publish_dir/ - touch temp_publish_dir/noirc_abi_wasm/yarn.lock + touch temp_publish_dir/yarn.lock - name: Publish to NPM - working-directory: ./temp_publish_dir/noirc_abi_wasm + working-directory: ./temp_publish_dir # run: yarn npm publish --tag latest run: yarn pack --dry-run env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} + diff --git a/.github/workflows/publish-acvm-js.yml b/.github/workflows/publish-acvm-js.yml index 328599383ab..683b1cb2cce 100644 --- a/.github/workflows/publish-acvm-js.yml +++ b/.github/workflows/publish-acvm-js.yml @@ -39,16 +39,16 @@ jobs: run: nix build .#acvm_js - name: Discover Build Output Path - run: echo "BUILD_OUTPUT_PATH=$(readlink -f ./result)" >> $GITHUB_ENV + run: echo "BUILD_OUTPUT_PATH=$(readlink -f ./result/acvm_js)" >> $GITHUB_ENV - name: Copy Build Output to Temporary Directory run: | mkdir temp_publish_dir cp -r ${{ env.BUILD_OUTPUT_PATH }}/* temp_publish_dir/ - touch temp_publish_dir/acvm_js/yarn.lock - + touch temp_publish_dir/yarn.lock + - name: Publish to NPM - working-directory: ./temp_publish_dir/acvm_js + working-directory: ./temp_publish_dir # run: yarn npm publish --tag latest run: yarn pack --dry-run env: diff --git a/.github/workflows/publish-noir-wasm.yml b/.github/workflows/publish-noir-wasm.yml index 07edcc07802..2ab68447244 100644 --- a/.github/workflows/publish-noir-wasm.yml +++ b/.github/workflows/publish-noir-wasm.yml @@ -35,16 +35,16 @@ jobs: run: nix build .#noir_wasm - name: Discover Build Output Path - run: echo "BUILD_OUTPUT_PATH=$(readlink -f ./result)" >> $GITHUB_ENV + run: echo "BUILD_OUTPUT_PATH=$(readlink -f ./result/noir_wasm)" >> $GITHUB_ENV - name: Copy Build Output to Temporary Directory run: | mkdir temp_publish_dir cp -r ${{ env.BUILD_OUTPUT_PATH }}/* temp_publish_dir/ - touch temp_publish_dir/noir_wasm/yarn.lock + touch temp_publish_dir/yarn.lock - name: Publish to NPM - working-directory: ./temp_publish_dir/noir_wasm + working-directory: ./temp_publish_dir # run: yarn npm publish --tag latest run: yarn pack --dry-run env: From 735abe7091b86b68e4adf7443a02e6050648f85d Mon Sep 17 00:00:00 2001 From: Jonathan Bursztyn Date: Mon, 2 Oct 2023 01:28:19 -0400 Subject: [PATCH 09/12] Remove debug processes --- .github/workflows/publish-abi_wasm.yml | 6 +----- .github/workflows/publish-acvm-js.yml | 6 +----- .github/workflows/publish-noir-js.yml | 6 +----- .github/workflows/publish-noir-wasm.yml | 6 +----- .github/workflows/publish-source-resolver.yml | 6 +----- 5 files changed, 5 insertions(+), 25 deletions(-) diff --git a/.github/workflows/publish-abi_wasm.yml b/.github/workflows/publish-abi_wasm.yml index fe8696f86d1..c84a8f0688b 100644 --- a/.github/workflows/publish-abi_wasm.yml +++ b/.github/workflows/publish-abi_wasm.yml @@ -6,9 +6,6 @@ on: noir-ref: description: The noir reference to checkout required: true - push: - branches: - - jb-fix-publishing-workflows jobs: noirc-abi-wasm-build: @@ -48,8 +45,7 @@ jobs: - name: Publish to NPM working-directory: ./temp_publish_dir - # run: yarn npm publish --tag latest - run: yarn pack --dry-run + run: yarn npm publish --tag latest env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/publish-acvm-js.yml b/.github/workflows/publish-acvm-js.yml index 683b1cb2cce..997cdbd565e 100644 --- a/.github/workflows/publish-acvm-js.yml +++ b/.github/workflows/publish-acvm-js.yml @@ -6,9 +6,6 @@ on: acvm-ref: description: The acvm reference to checkout required: true - push: - branches: - - jb-fix-publishing-workflows jobs: publish-acvm-js-package: @@ -49,7 +46,6 @@ jobs: - name: Publish to NPM working-directory: ./temp_publish_dir - # run: yarn npm publish --tag latest - run: yarn pack --dry-run + run: yarn npm publish --tag latest env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/publish-noir-js.yml b/.github/workflows/publish-noir-js.yml index e2ca08711ce..4a197c83e90 100644 --- a/.github/workflows/publish-noir-js.yml +++ b/.github/workflows/publish-noir-js.yml @@ -2,9 +2,6 @@ name: Publish Noir Js on: workflow_dispatch: - push: - branches: - - jb-fix-publishing-workflows jobs: release-noir-js: @@ -52,7 +49,6 @@ jobs: - name: Publish to NPM working-directory: ./tooling/noir_js - # run: yarn npm publish --access public - run: yarn pack --dry-run + run: yarn npm publish --access public env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/publish-noir-wasm.yml b/.github/workflows/publish-noir-wasm.yml index 2ab68447244..f2302c674ee 100644 --- a/.github/workflows/publish-noir-wasm.yml +++ b/.github/workflows/publish-noir-wasm.yml @@ -2,9 +2,6 @@ name: Publish Noir Wasm on: workflow_dispatch: - push: - branches: - - jb-fix-publishing-workflows jobs: publish-noir-wasm: @@ -45,7 +42,6 @@ jobs: - name: Publish to NPM working-directory: ./temp_publish_dir - # run: yarn npm publish --tag latest - run: yarn pack --dry-run + run: yarn npm publish --tag latest env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} diff --git a/.github/workflows/publish-source-resolver.yml b/.github/workflows/publish-source-resolver.yml index 5df24b14847..399e72a7b96 100644 --- a/.github/workflows/publish-source-resolver.yml +++ b/.github/workflows/publish-source-resolver.yml @@ -2,9 +2,6 @@ name: Publish Source Resolver on: workflow_dispatch: - push: - branches: - - jb-fix-publishing-workflows jobs: release-source-resolver: @@ -28,7 +25,6 @@ jobs: - name: Publish to NPM working-directory: ./compiler/source-resolver - # run: yarn npm publish - run: yarn pack --dry-run + run: yarn npm publish env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }} From 00feaaf82f08f945196e3567b3558cc372cf74fe Mon Sep 17 00:00:00 2001 From: Jonathan Bursztyn Date: Mon, 2 Oct 2023 12:15:01 -0400 Subject: [PATCH 10/12] Revise --- .github/workflows/publish-noir-js.yml | 8 ++++---- .github/workflows/publish-noir-wasm.yml | 6 +++--- rust-toolchain.toml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish-noir-js.yml b/.github/workflows/publish-noir-js.yml index 4a197c83e90..7bf6b82c284 100644 --- a/.github/workflows/publish-noir-js.yml +++ b/.github/workflows/publish-noir-js.yml @@ -22,10 +22,10 @@ jobs: with: toolchain: 1.67.0 - - name: Install cargo and wasm-bindgen - run: | - source $HOME/.cargo/env - cargo install -f wasm-bindgen-cli --version 0.2.86 + - name: Install wasm-bindgen-cli + uses: taiki-e/install-action@v2 + with: + tool: wasm-bindgen-cli@0.2.86 - name: Install wasm-opt run: | diff --git a/.github/workflows/publish-noir-wasm.yml b/.github/workflows/publish-noir-wasm.yml index f2302c674ee..c434fa5077a 100644 --- a/.github/workflows/publish-noir-wasm.yml +++ b/.github/workflows/publish-noir-wasm.yml @@ -21,9 +21,6 @@ jobs: target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - name: Authenticate with npm - run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc - - uses: cachix/install-nix-action@v22 with: nix_path: nixpkgs=channel:nixos-23.05 @@ -40,6 +37,9 @@ jobs: cp -r ${{ env.BUILD_OUTPUT_PATH }}/* temp_publish_dir/ touch temp_publish_dir/yarn.lock + - name: Authenticate with npm + run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc + - name: Publish to NPM working-directory: ./temp_publish_dir run: yarn npm publish --tag latest diff --git a/rust-toolchain.toml b/rust-toolchain.toml index c0185fffbfb..63f41db96a1 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "1.67.0" +channel = "1.66.1" components = [ "rust-src" ] targets = [ "wasm32-unknown-unknown", "wasm32-wasi", "aarch64-apple-darwin" ] profile = "default" From 1bc59207e18b0dc548002c5e7e18d4a9ae0bbc6f Mon Sep 17 00:00:00 2001 From: Jonathan Bursztyn Date: Mon, 2 Oct 2023 12:17:01 -0400 Subject: [PATCH 11/12] Change SHA --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 541997eab39..9b3d22b8167 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,7 @@ rustToolchain = fenix.packages.${system}.fromToolchainFile { file = ./rust-toolchain.toml; - sha256 = "sha256-riZUc+R9V35c/9e8KJUE+8pzpXyl0lRXt3ZkKlxoY0g="; + sha256 = "sha256-Zk2rxv6vwKFkTTidgjPm6gDsseVmmljVt201H7zuDkk="; }; craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchain; From 8640bc77380b0abea888ad8e7c3dc6bb2f0d7c7c Mon Sep 17 00:00:00 2001 From: Jonathan Bursztyn Date: Mon, 2 Oct 2023 16:36:18 -0400 Subject: [PATCH 12/12] Update .github/workflows/publish-noir-js.yml Co-authored-by: Tom French <15848336+TomAFrench@users.noreply.github.com> --- .github/workflows/publish-noir-js.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/publish-noir-js.yml b/.github/workflows/publish-noir-js.yml index 7bf6b82c284..f10f0181fb6 100644 --- a/.github/workflows/publish-noir-js.yml +++ b/.github/workflows/publish-noir-js.yml @@ -18,9 +18,7 @@ jobs: run: sudo apt-get install jq - name: Setup toolchain - uses: dtolnay/rust-toolchain@master - with: - toolchain: 1.67.0 + uses: dtolnay/rust-toolchain@1.66.0 - name: Install wasm-bindgen-cli uses: taiki-e/install-action@v2