chore: update Azure and Nix configs
This commit is contained in:
parent
5c286ca6fd
commit
b8d5193ecc
2 changed files with 5 additions and 5 deletions
|
|
@ -35,7 +35,7 @@ jobs:
|
|||
displayName: Setup
|
||||
- script: |
|
||||
. ~/.nix-profile/etc/profile.d/nix.sh
|
||||
export CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ $CMAKE_OPTIONS"
|
||||
export CMAKE_OPTIONS="-DCMAKE_BUILD_TYPE=Release $CMAKE_OPTIONS"
|
||||
eval nix-shell $NIX_SHELL_OPTIONS --run ./script/ci.sh
|
||||
displayName: Build
|
||||
- task: PublishTestResults@2
|
||||
|
|
|
|||
|
|
@ -2,12 +2,12 @@
|
|||
|
||||
let
|
||||
lean = import ./default.nix args;
|
||||
temci = import (builtins.fetchGit { url = http://github.com/parttimenerd/temci.git; rev = "ba1505a7c2de471a5821a2643b34de2d1c1af03e"; }) { inherit pkgs; };
|
||||
temci = import (builtins.fetchGit { url = http://github.com/parttimenerd/temci.git; rev = "4cae802606b871021394e250a280a2154b92f44b"; }) { inherit pkgs; };
|
||||
in pkgs.mkShell.override { stdenv = lean.stdenv; } rec {
|
||||
inputsFrom = [ lean ];
|
||||
buildInputs = with pkgs; [ temci ccache ninja ];
|
||||
buildInputs = with pkgs; [ temci ];
|
||||
# https://github.com/NixOS/nixpkgs/issues/60919
|
||||
hardeningDisable = [ "all" ];
|
||||
# TODO: this should not be necessary when leanc starts statically linking binaries
|
||||
LD_LIBRARY_PATH = "${pkgs.stdenv.lib.makeLibraryPath buildInputs}:$LD_LIBRARY_PATH";
|
||||
# more convenient `ctest` output
|
||||
CTEST_OUTPUT_ON_FAILURE = 1;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue