Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ci): remove toml2json dependency #2862

Merged
merged 1 commit into from
Sep 27, 2023
Merged

chore(ci): remove toml2json dependency #2862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/publish-noir-js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/test-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/test-noir-js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions acvm-repo/acvm_js/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
ln -s $out $self_path/result
5 changes: 2 additions & 3 deletions compiler/wasm/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
ln -s $out $self_path/result
1 change: 0 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
rustToolchain
wasm-bindgen-cli
binaryen
toml2json
];

buildInputs = [ ] ++ extraBuildInputs;
Expand Down
5 changes: 2 additions & 3 deletions tooling/noirc_abi_wasm/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
ln -s $out $self_path/result