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

propagate flake utils; bump submodules #627

Merged
merged 3 commits into from
Jul 25, 2024
Merged

propagate flake utils; bump submodules #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a064fec
propagate flake utils; bump submodules
AndreyMlashkin Jul 24, 2024
0a2bb47
run tests also in master
AndreyMlashkin Jul 25, 2024
82243ca
don't run crypto3 tests
AndreyMlashkin Jul 25, 2024
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
1 change: 0 additions & 1 deletion .github/workflows/nix_build_linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ on:

jobs:
handle-syncwith:
if: github.event_name == 'pull_request'
name: Call Reusable SyncWith Handler
uses: NilFoundation/ci-cd/.github/workflows/reusable-handle-syncwith.yml@v1
with:
Expand Down
128 changes: 48 additions & 80 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@
submodules = false;
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
};
};
nil-zkllvm-blueprint = {
url = "https://github.com/NilFoundation/zkllvm-blueprint";
type = "git";
submodules = true;
inputs = {
flake-utils.follows = "flake-utils";
nixpkgs.follows = "nixpkgs";
nil-crypto3.follows = "nil-crypto3";
};
Expand All @@ -43,7 +45,7 @@
inherit system;
overlays = [ nix-3rdparty.overlays.${system}.default ];
};
crypto3 = nil-crypto3.packages.${system}.default;
crypto3 = nil-crypto3.packages.${system}.crypto3;
blueprint = nil-zkllvm-blueprint.packages.${system}.default;

in {
Expand Down
2 changes: 1 addition & 1 deletion libs/assigner
Open in desktop
Submodule assigner updated 1 files
+1 −1 .gitmodules
2 changes: 1 addition & 1 deletion libs/transpiler
Open in desktop
Submodule transpiler updated 1 files
+1 −1 .gitmodules
Loading