diff --git a/.github/workflows/publish-noir-js.yml b/.github/workflows/publish-noir-js.yml index 75999bb087d..4614390e053 100644 --- a/.github/workflows/publish-noir-js.yml +++ b/.github/workflows/publish-noir-js.yml @@ -23,11 +23,6 @@ jobs: source $HOME/.cargo/env cargo install -f wasm-bindgen-cli --version 0.2.86 - - name: Install toml2json - run: | - source $HOME/.cargo/env - cargo install toml2json - - name: Install wasm-opt run: | npm i wasm-opt -g diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 09e54b288dc..ebc2136f514 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -202,11 +202,6 @@ jobs: with: tool: wasm-bindgen-cli@0.2.86 - - name: Install toml2json - uses: taiki-e/install-action@v2 - with: - tool: toml2json@1.3.1 - - name: Install wasm-opt run: | npm i wasm-opt -g diff --git a/.github/workflows/test-noir-js.yml b/.github/workflows/test-noir-js.yml index 3a4868f4b1c..1dac0200027 100644 --- a/.github/workflows/test-noir-js.yml +++ b/.github/workflows/test-noir-js.yml @@ -38,11 +38,6 @@ jobs: with: tool: wasm-bindgen-cli@0.2.86 - - name: Install toml2json - uses: taiki-e/install-action@v2 - with: - tool: toml2json@1.3.1 - - name: Install wasm-opt run: | npm i wasm-opt -g diff --git a/acvm-repo/acvm_js/build.sh b/acvm-repo/acvm_js/build.sh index 8157e42c6de..37f2fd0a5a9 100755 --- a/acvm-repo/acvm_js/build.sh +++ b/acvm-repo/acvm_js/build.sh @@ -22,14 +22,13 @@ function run_or_fail { fi } -require_command toml2json require_command jq require_command cargo require_command wasm-bindgen check_installed wasm-opt self_path=$(dirname "$(readlink -f "$0")") -export pname=$(toml2json < $self_path/Cargo.toml | jq -r .package.name) +export pname=$(cargo read-manifest | jq -r '.name') export CARGO_TARGET_DIR=$self_path/target rm -rf $self_path/outputs >/dev/null 2>&1 @@ -45,4 +44,4 @@ fi run_or_fail $self_path/buildPhaseCargoCommand.sh run_or_fail $self_path/installPhase.sh -ln -s $out $self_path/result \ No newline at end of file +ln -s $out $self_path/result diff --git a/compiler/wasm/build.sh b/compiler/wasm/build.sh index 8157e42c6de..37f2fd0a5a9 100755 --- a/compiler/wasm/build.sh +++ b/compiler/wasm/build.sh @@ -22,14 +22,13 @@ function run_or_fail { fi } -require_command toml2json require_command jq require_command cargo require_command wasm-bindgen check_installed wasm-opt self_path=$(dirname "$(readlink -f "$0")") -export pname=$(toml2json < $self_path/Cargo.toml | jq -r .package.name) +export pname=$(cargo read-manifest | jq -r '.name') export CARGO_TARGET_DIR=$self_path/target rm -rf $self_path/outputs >/dev/null 2>&1 @@ -45,4 +44,4 @@ fi run_or_fail $self_path/buildPhaseCargoCommand.sh run_or_fail $self_path/installPhase.sh -ln -s $out $self_path/result \ No newline at end of file +ln -s $out $self_path/result diff --git a/flake.nix b/flake.nix index fe422a02848..996b760fee9 100644 --- a/flake.nix +++ b/flake.nix @@ -109,7 +109,6 @@ rustToolchain wasm-bindgen-cli binaryen - toml2json ]; buildInputs = [ ] ++ extraBuildInputs; diff --git a/tooling/noirc_abi_wasm/build.sh b/tooling/noirc_abi_wasm/build.sh index 8157e42c6de..37f2fd0a5a9 100755 --- a/tooling/noirc_abi_wasm/build.sh +++ b/tooling/noirc_abi_wasm/build.sh @@ -22,14 +22,13 @@ function run_or_fail { fi } -require_command toml2json require_command jq require_command cargo require_command wasm-bindgen check_installed wasm-opt self_path=$(dirname "$(readlink -f "$0")") -export pname=$(toml2json < $self_path/Cargo.toml | jq -r .package.name) +export pname=$(cargo read-manifest | jq -r '.name') export CARGO_TARGET_DIR=$self_path/target rm -rf $self_path/outputs >/dev/null 2>&1 @@ -45,4 +44,4 @@ fi run_or_fail $self_path/buildPhaseCargoCommand.sh run_or_fail $self_path/installPhase.sh -ln -s $out $self_path/result \ No newline at end of file +ln -s $out $self_path/result