Wobble

Author: hasufell

.github/scripts/build.sh

@@ -38,22 +38,23 @@ args=(
 )
 
 cabal --store-dir=store update
-cabal --store-dir=store v2-build "${args[@]}" cabal-install
+cabal --store-dir=store v2-build "${args[@]}" cabal-install:exe:cabal cabal-testsuite:cabal-tests
 
 mkdir -p "out"
 # shellcheck disable=SC2154
 cp "$(cabal --store-dir=store list-bin "${args[@]}" cabal-install:exe:cabal)" "out/cabal$ext"
+cp "$(cabal --store-dir=store list-bin "${args[@]}" cabal-testsuite:cabal-tests)" "out/cabal-tests$ext"
 cp dist-newstyle/cache/plan.json "out/plan.json"
 cd "out/"
 
 # create tarball/zip
 TARBALL_PREFIX="cabal-install-$("./cabal" --numeric-version)"
 case "${TARBALL_EXT}" in
     zip)
-        zip "${TARBALL_PREFIX}-${ARTIFACT}.${TARBALL_EXT}" "cabal${ext}" plan.json
+        zip "${TARBALL_PREFIX}-${ARTIFACT}.${TARBALL_EXT}" "cabal${ext}" "cabal-tests${ext}" plan.json
         ;;
     tar.xz)
-        tar caf "${TARBALL_PREFIX}-${ARTIFACT}.${TARBALL_EXT}" "cabal${ext}" plan.json
+        tar caf "${TARBALL_PREFIX}-${ARTIFACT}.${TARBALL_EXT}" "cabal${ext}" "cabal-tests${ext}" plan.json
         ;;
     *)
         fail "Unknown TARBALL_EXT: ${TARBALL_EXT}"

.github/scripts/test.sh

@@ -26,12 +26,7 @@ cabal --store-dir=store update
 
 # TODO: we want to avoid building here... we should just
 # be using the previously built 'cabal-tests' binary
-cabal --store-dir=store run \
-  --disable-profiling \
-  --enable-executable-stripping \
-  --project-file=cabal.release.project \
- ${ADD_CABAL_ARGS} \
- cabal-testsuite:cabal-tests -- \
+"$(pwd)/out/cabal-tests" \
   --with-cabal "$(pwd)/out/cabal" \
   --intree-cabal-lib "$(pwd)" \
   --test-tmp "$(pwd)/testdb" \