Skip to content

Commit

Permalink
address Matt's review
Browse files Browse the repository at this point in the history
  • Loading branch information
Geometer1729 committed Dec 12, 2024
1 parent 4e3fc93 commit 20690d1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build-bindings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
cd src/bindings
git diff --exit-code
- name: add build to gc-root if on main
# enabeling on this branch for 1 commit to test it
if: github.ref == 'refs/heads/main'
run: |
nix build o1js#o1js-bindings --out-link /home/app/actions-runner/nix-cache/main-bindings-gcroot
Expand Down
5 changes: 2 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,10 @@
''
if [ "$1" = run ] && { [ "$2" = nightly-2023-09-01 ] || [ "$2" = 1.72-x86_64-unknowl-linux-gnu ]; }
then
echo USING NIX TOOLCHAIN
echo using nix toolchain
${rustup}/bin/rustup run nix "''${@:3}"
else
echo escape rustup "$@"
echo using plain rustup "$@"
${rustup}/bin/rustup "$@"
fi
'';
Expand Down Expand Up @@ -184,7 +184,6 @@
test-vectors = rust-platform.buildRustPackage {
src = pkgs.lib.sourceByRegex ./src/mina/src
[
"^lib(/crypto(/kimchi_bindings(/stubs(/.*)?)?)?)?$"
"^lib(/crypto(/proof-systems(/.*)?)?)?$"
];
sourceRoot = "source/lib/crypto/proof-systems/poseidon/export_test_vectors";
Expand Down
2 changes: 1 addition & 1 deletion pin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ git submodule sync && git submodule update --init --recursive
# Add the flake registry entry
nix registry add o1js "git+file://$ROOT?submodules=1"
# update mina input to local submodule
# --override-input seems redundant but fixes a cacheing issue with local paths
# --override-input seems redundant but fixes a caching issue with local paths
nix flake update mina --override-input mina 'path:src/mina' --flake '.?submodules=1'
popd

0 comments on commit 20690d1

Please sign in to comment.