Skip to content

Commit

Permalink
Implement placeholder CI
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreyMlashkin committed Sep 4, 2024
1 parent 0c2b518 commit 3ba608b
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 356 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux-nix-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
fetch-depth: 0

- name: Run checks
run: nix flake -L check
run: nix build -L .?checks.x86_64-linux.all-gcc
env:
NIX_CONFIG: |
cores = 6
cores = 4
2 changes: 1 addition & 1 deletion .github/workflows/mac-nix-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: DeterminateSystems/flake-checker-action@main

- name: Run checks
run: nix flake -L check
run: nix build -L .?checks.aarch64-darwin.all-gcc
env:
NIX_CONFIG: |
cores = 0
Expand Down
7 changes: 3 additions & 4 deletions crypto3/crypto3.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
ninja,
pkg-config,
cmake,
boost183,
# We'll use boost183 by default, but you can override it
boost_lib ? boost183,
boost,
gdb,
cmake_modules,
enableDebugging,
Expand All @@ -22,7 +20,7 @@ in stdenv.mkDerivation {
nativeBuildInputs = [ cmake ninja pkg-config ] ++ (lib.optional (!stdenv.isDarwin) gdb);

# enableDebugging will keep debug symbols in boost
propagatedBuildInputs = [ (if enableDebug then (enableDebugging boost_lib) else boost_lib) ];
propagatedBuildInputs = [ (if enableDebug then (enableDebugging boost) else boost) ];

buildInputs = [cmake_modules];

Expand All @@ -33,6 +31,7 @@ in stdenv.mkDerivation {
(if enableDebug then "-DCMAKE_BUILD_TYPE=Debug" else "-DCMAKE_BUILD_TYPE=Release")
(if enableDebug then "-DCMAKE_CXX_FLAGS=-ggdb" else "")
(if enableDebug then "-DCMAKE_CXX_FLAGS=-O0" else "")
"-G Ninja"
];

doCheck = runTests; # tests are inside crypto3-tests derivation
Expand Down
84 changes: 0 additions & 84 deletions crypto3/flake.lock

This file was deleted.

59 changes: 0 additions & 59 deletions crypto3/flake.nix

This file was deleted.

4 changes: 2 additions & 2 deletions crypto3/libs/blueprint/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@ set(ZKEVM_TESTS_FILES
"zkevm/state_selector"
"zkevm/zkevm_word"
"zkevm/state_transition"
"zkevm/opcodes/iszero"
# "zkevm/opcodes/iszero" TODO re-activate
"zkevm/opcodes/add_sub"
"zkevm/opcodes/mul"
#"zkevm/opcodes/mul"
"zkevm/opcodes/div"
)

Expand Down
111 changes: 0 additions & 111 deletions evm-assigner/flake.lock

This file was deleted.

80 changes: 0 additions & 80 deletions evm-assigner/flake.nix

This file was deleted.

Loading

0 comments on commit 3ba608b

Please sign in to comment.