Skip to content

Commit

Permalink
nix...
Browse files Browse the repository at this point in the history
  • Loading branch information
x-mass committed Jun 21, 2024
1 parent ce07dbb commit 54e7f40
Show file tree
Hide file tree
Showing 3 changed files with 106 additions and 28 deletions.
24 changes: 5 additions & 19 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,13 +124,9 @@ jobs:
done
echo "run-id=${run_id}" >> $GITHUB_OUTPUT
# This is copied from reusable-generate-proofs-linux.yml
# Disgusting duplication, we should better move all preparation and build to nix, then
# make testing steps a composite action.
build-and-generate-proofs:
name: Build prover, generate proofs for circuits
runs-on: [self-hosted, Linux, X64, aws_autoscaling]
runs-on: ubuntu-22.04
needs:
- handle-syncwith
- get-zkllvm-run
Expand All @@ -144,11 +140,7 @@ jobs:
artifact-name: ${{ steps.artifact-name.outputs.merged }}

steps:
# https://github.com/actions/checkout/issues/1552
- name: Clean up after previous checkout
run: chmod +w -R ${GITHUB_WORKSPACE}; rm -rf ${GITHUB_WORKSPACE}/*;

- name: Checkout Crypto3
- name: Checkout Proof Producer
uses: actions/checkout@v4
with:
fetch-depth: 0
Expand All @@ -164,17 +156,11 @@ jobs:
!${{ github.workspace }}/
!${{ github.workspace }}/**/.git/**
# - name: Run clang-format
# run: |
# if find bin -iname '*.cpp' -o -iname '*.hpp' | xargs clang-format -n --Werror; then
# echo "Code formatting is correct"
# else
# echo "Code formatting differs from clang-format's expectations, run 'find bin -iname *.hpp -o -iname *.cpp | xargs clang-format -i'"
# exit 1
# fi
- uses: cachix/install-nix-action@v27
- uses: DeterminateSystems/magic-nix-cache-action@v7

- name: Run checks
run: nix -L build .?submodules=1
run: nix -L build '.?submodules=1#'
# env:
# NIX_CONFIG: |
# cores = 6
Expand Down
106 changes: 99 additions & 7 deletions flake.lock

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

4 changes: 2 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
};
parallel-crypto3 = {
url = "git+https://github.com/NilFoundation/parallel-crypto3?submodules=1";
inputs.nixpkgs.follows = "nixpkgs";
inputs.crypto3.follows = "crypto3";
# inputs.nixpkgs.follows = "nixpkgs";
# inputs.crypto3.follows = "crypto3";
};
flake-utils.url = "github:numtide/flake-utils";
};
Expand Down

0 comments on commit 54e7f40

Please sign in to comment.