From 74ae98d3892d5a26ebf353f7dc3c93a18323ae8f Mon Sep 17 00:00:00 2001 From: Andrei Malashkin Date: Tue, 3 Sep 2024 19:21:16 +0200 Subject: [PATCH] use gcc on linux and clang on mac --- .github/workflows/linux-nix-check.yml | 2 +- .github/workflows/mac-nix-check.yml | 2 +- flake.nix | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/linux-nix-check.yml b/.github/workflows/linux-nix-check.yml index d774d21363..e8b6a342b2 100644 --- a/.github/workflows/linux-nix-check.yml +++ b/.github/workflows/linux-nix-check.yml @@ -18,7 +18,7 @@ jobs: fetch-depth: 0 - name: Run checks - run: nix flake -L check + run: nix build -L .?submodules=1#packages.x86_64-linux.all-gcc env: NIX_CONFIG: | cores = 4 diff --git a/.github/workflows/mac-nix-check.yml b/.github/workflows/mac-nix-check.yml index 99fb449563..f2f24f70af 100644 --- a/.github/workflows/mac-nix-check.yml +++ b/.github/workflows/mac-nix-check.yml @@ -19,7 +19,7 @@ jobs: - uses: DeterminateSystems/flake-checker-action@main - name: Run checks - run: nix flake -L check + run: nix build -L .?submodules=1#packages.aarch64-darwin.all-gcc env: NIX_CONFIG: | cores = 0 diff --git a/flake.nix b/flake.nix index 0049cf0bae..2b48fc4721 100644 --- a/flake.nix +++ b/flake.nix @@ -74,11 +74,15 @@ crypto3 = crypto3-clang; }); - all = pkgs.symlinkJoin { + all-clang = pkgs.symlinkJoin { + name = "all"; + paths = [ crypto3-clang evm-assigner-clang ]; + }; + all-gcc = pkgs.symlinkJoin { name = "all"; - paths = [ crypto3-clang evm-assigner-clang crypto3-gcc evm-assigner-gcc ]; + paths = [ crypto3-gcc evm-assigner-gcc ]; }; - default = all; + default = all-gcc; }; })); }