From 5114405b9009625e22dd1cd1e8f02f36b898c2ff Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Tue, 29 May 2018 08:30:05 +0100 Subject: [PATCH] [DEVOPS-632] ci: Build benchmarks under hydra and buildkite --- default.nix | 9 ++++++++- scripts/ci/ci.sh | 25 +++++-------------------- 2 files changed, 13 insertions(+), 21 deletions(-) diff --git a/default.nix b/default.nix index 0f8af9bc8cc..eefd20bbc48 100644 --- a/default.nix +++ b/default.nix @@ -10,6 +10,7 @@ in , forceDontCheck ? false , enableProfiling ? false , enableDebugging ? false +, enableBenchmarks ? true , allowCustomConfig ? true }: @@ -31,6 +32,12 @@ let kill $TAILPID ''; }); + # Enables building but not running of benchmarks when + # enableBenchmarks argument is supplied. + withBenchmarks = drv: if enableBenchmarks + then doBenchmark (appendConfigureFlag drv "--enable-benchmarks") + else drv; + cardanoPkgs = ((import ./pkgs { inherit pkgs; }).override { ghc = overrideDerivation pkgs.haskell.compiler.ghc802 (drv: { patches = drv.patches ++ [ ./ghc-8.0.2-darwin-rec-link.patch ]; @@ -64,7 +71,7 @@ let executableHaskellDepends = drv.executableHaskellDepends ++ [self.cabal-install]; }))); cardano-sl-node = addGitRev super.cardano-sl-node; - cardano-sl-wallet-new = addGitRev (justStaticExecutables super.cardano-sl-wallet-new); + cardano-sl-wallet-new = addGitRev (justStaticExecutables (withBenchmarks super.cardano-sl-wallet-new)); cardano-sl-tools = addGitRev (justStaticExecutables (overrideCabal super.cardano-sl-tools (drv: { # waiting on load-command size fix in dyld doCheck = ! pkgs.stdenv.isDarwin; diff --git a/scripts/ci/ci.sh b/scripts/ci/ci.sh index b8fe72b2091..b885701509a 100755 --- a/scripts/ci/ci.sh +++ b/scripts/ci/ci.sh @@ -22,20 +22,14 @@ fi # TODO: CSL-1133: Add test coverage to CI. To be reenabled when build times # become smaller and allow coverage report to be built. -#projects="core db lrc infra update ssc godtossing txp" -#to_build='' - -#for prj in $projects; do -# to_build="$to_build cardano-sl-$prj" -#done for trgt in $targets; do - # echo "Prebuilding dependencies for $trgt, quietly.." - # nix-shell -A $trgt --run true --no-build-output --cores 0 --max-jobs 4 default.nix || - # echo "Prebuild failed!" - echo "Building $trgt verbosely.." - nix-build -A "$trgt" -o "$trgt.root" --argstr gitrev "$BUILDKITE_COMMIT" --argstr buildId "$BUILDKITE_BUILD_NUMBER" + nix-build -A "$trgt" -o "$trgt.root" \ + --argstr gitrev "$BUILDKITE_COMMIT" \ + --argstr buildId "$BUILDKITE_BUILD_NUMBER" \ + --argStr enableBenchmarks true + # TODO: CSL-1133 # if [[ "$trgt" == "cardano-sl" ]]; then # stack test --nix --fast --jobs=2 --coverage \ @@ -44,12 +38,3 @@ for trgt in $targets; do # fi done - -#if [[ "$OS_NAME" == "linux" && "$BUILDKITE_BRANCH" == "master" && "$BUILDKITE_PULL_REQUEST" == "false" ]]; then - # XXX: DEVOPS-728 this won't work, unless `GITHUB_CARDANO_DOCS_ACCESS_2` and `GITHUB_CARDANO_DOCS_ACCESS` vars are supplied - # - #./update-wallet-web-api-docs.sh - #./update-explorer-web-api-docs.sh - #./update-cli-docs.sh - #./update-haddock.sh -#fi