diff --git a/nix/ci.sh b/nix/ci.sh index 5ae455a..b0785ff 100755 --- a/nix/ci.sh +++ b/nix/ci.sh @@ -17,10 +17,10 @@ function build-one { # nix-build --no-out-link nix/all.nix -A "\"$ATTRPATH\".butcher.components.tests"\ # 2> >(tee "$OUTDIR/$ATTRPATH-2-build-test.txt" >&2) # (($? == 0)) || { echo "$ATTRPATH: build test failed" >> "$SUMMARY"; return 1; } - nix-build -o "$OUTDIR/$ATTRPATH-build" nix/all.nix -A "\"$ATTRPATH\".allComponents"\ + nix-build -o "$OUTDIR/$ATTRPATH-build" nix/all.nix -Q -A "\"$ATTRPATH\".allComponents"\ 2> >(tee "$OUTDIR/$ATTRPATH-build.txt" >&2) (($? == 0)) || { echo "$ATTRPATH: all-component build failed" >> "$SUMMARY"; return 1; } - nix-build -o "$OUTDIR/$ATTRPATH-test-result.txt" nix/all.nix -A "\"$ATTRPATH\".butcher.checks.tests" + nix-build -o "$OUTDIR/$ATTRPATH-test-result.txt" -Q nix/all.nix -A "\"$ATTRPATH\".butcher.checks.tests" (($? == 0)) || { echo "$ATTRPATH: run test failed" >> "$SUMMARY"; return 1; } echo "$ATTRPATH: $(grep examples "$OUTDIR/$ATTRPATH-test-result.txt")" >> "$SUMMARY" } diff --git a/nix/create-roots.sh b/nix/create-roots.sh index 82e56d5..68e7e85 100755 --- a/nix/create-roots.sh +++ b/nix/create-roots.sh @@ -5,15 +5,15 @@ ROOTSDIR="nix/gcroots" function create-root { local ATTRPATH=$1 - nix-build -o "${ROOTSDIR}/${ATTRPATH}-shell" nix/all.nix -A "\"$ATTRPATH\".shell" - nix-build -o "${ROOTSDIR}/${ATTRPATH}-test" nix/all.nix -A "\"$ATTRPATH\".butcher.components.tests.tests" - nix-build -o "${ROOTSDIR}/${ATTRPATH}-plan" nix/all.nix -A "\"$ATTRPATH\".butcher-plan" - nix-build -o "${ROOTSDIR}/${ATTRPATH}-nix" nix/all.nix -A "\"$ATTRPATH\".butcher-nix" || true + nix-build -Q -o "${ROOTSDIR}/${ATTRPATH}-shell" nix/all.nix -A "\"$ATTRPATH\".shell" + nix-build -Q -o "${ROOTSDIR}/${ATTRPATH}-test" nix/all.nix -A "\"$ATTRPATH\".butcher.components.tests.tests" + nix-build -Q -o "${ROOTSDIR}/${ATTRPATH}-plan" nix/all.nix -A "\"$ATTRPATH\".butcher-plan" + nix-build -Q -o "${ROOTSDIR}/${ATTRPATH}-nix" nix/all.nix -A "\"$ATTRPATH\".butcher-nix" || true } mkdir -p "$ROOTSDIR" -nix-build -o "${ROOTSDIR}/haskell-nix-roots" nix/all.nix -A "roots" +nix-build -Q -o "${ROOTSDIR}/haskell-nix-roots" nix/all.nix -A "roots" create-root "stackage-8.4" create-root "stackage-8.6"