ghcid auto-reload for tests

This change extends multi-home units to work with tests as well. We
first make vira tests a proper spec (not executable), and then add that
to --enable-multi-repl so that the tests re-compile when the library
sources change.

This option is define in one place, ./cabal-repl. We could potentially
nixify this using srid/haskell-flake#449

Also, the tests no longer build in Nix for vira, as they require
network. Instead the Github workflow runs them through cabal.

Author: srid

.github/workflows/ci.yaml

@@ -22,7 +22,7 @@ jobs:
         run: nix run . -- --help
       - name: Run Tests
         run: |
-          nix --option system "${{ matrix.system }}" run .#vira-tests
+          nix --option system "${{ matrix.system }}" develop -c cabal test all
       - name: Push to Attic
         run: |
           attic login chutney https://cache.nixos.asia ${{ secrets.ATTIC_LOGIN_TOKEN }}

cabal-repl

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# For use with GHC home units
+# https://x.com/sridca/status/1901283945779544362
+
+exec cabal repl --enable-multi-repl "$@" \
+    vira tail warp-tls-simple htmx-lucid-contrib

cabal.project

@@ -1,5 +1,5 @@
 packages:
   packages/vira
-  packages/htmx-lucid-contrib
-  packages/warp-tls-simple
   packages/tail
+  packages/warp-tls-simple
+  packages/htmx-lucid-contrib

justfile

@@ -15,7 +15,7 @@ run:
 # Run cabal tests (hspec)
 [group('2. haskell')]
 test:
-    ghcid --warnings -c "cabal repl vira:exe:vira-tests --flags=ghcid" --test "main"
+    ghcid --warnings -T Main.main -c "./cabal-repl vira:test:vira-tests"
 
 # Delete and recreate vira.db
 [group('1. vira')]

nix/modules/flake-parts/haskell.nix

@@ -3,6 +3,7 @@
   imports = [
     inputs.haskell-flake.flakeModule
   ];
+  debug = true;
   perSystem = { self', lib, config, pkgs, ... }: {
     # Our only Haskell project. You can have multiple projects, but this template
     # has only one.
@@ -33,6 +34,7 @@
       # Add your package overrides here
       settings = {
         vira = {
+          check = false; # Running outside of Nix.
           generateOptparseApplicativeCompletions = [ "vira" ];
           extraBuildDepends = [
             pkgs.git
@@ -93,8 +95,6 @@
       };
     };
 
-    apps.vira-tests = config.haskellProjects.default.outputs.apps.vira-tests;
-
     checks = config.haskellProjects.default.outputs.checks;
   };
 }

nix/modules/flake-parts/vira-dev.nix

@@ -4,21 +4,17 @@
   imports = [
     inputs.process-compose-flake.flakeModule
   ];
-  perSystem = { self', lib, config, pkgs, ... }: {
+  perSystem = { lib, config, pkgs, ... }: {
     process-compose."vira-dev" = {
       settings = {
         processes = let host = "0.0.0.0"; port = "5005"; in {
           haskell = {
             command =
-              let
-                # https://x.com/sridca/status/1901283945779544362
-                multiReplLibs = "vira:exe:vira vira tail warp-tls-simple htmx-lucid-contrib";
-              in
               pkgs.writeShellScriptBin "haskell-dev" ''
                 set -x
                 cd ./packages/vira
                 # Vira now auto-generates TLS certificates as needed
-                ghcid -T Main.main -c 'cabal repl --enable-multi-repl ${multiReplLibs}' \
+                ghcid -T Main.main -c '${root}/cabal-repl vira:exe:vira' \
                     --setup ":set args --host ${host} --base-path ''${BASE_PATH:-/} --state-dir ../../state"
               '';
             depends_on.tailwind.condition = "process_started";

packages/vira/package.yaml

@@ -92,8 +92,9 @@ executables:
     dependencies:
       - vira
 
+tests:
   vira-tests:
-    main: Test.hs
+    main: Spec.hs
     source-dirs: test
     dependencies:
-      - vira
+      - vira

packages/vira/src/Vira/Lib/Git.hs

@@ -15,7 +15,6 @@ import Data.Text qualified as T
 import Servant (FromHttpApiData, ToHttpApiData)
 import System.Process
 import System.Which (staticWhich)
-import Test.Hspec
 
 {- | Path to the `git` executable
 
@@ -77,11 +76,3 @@ cloneAtCommit url branch commit =
   [ proc git ["clone", "--branch", toString branch, "--single-branch", "--depth", "1", toString url, "."]
   , proc git ["checkout", toString commit]
   ]
-
-spec :: Spec
-spec = do
-  describe "Git" $ do
-    it "remoteBranches" $ do
-      let archivedRepo = "https://github.com/srid/leptos-nix-template" -- Archived; won't change
-      branches <- remoteBranches archivedRepo
-      Map.lookup "main" branches `shouldBe` Just "68506f5bf0a5883e737c0f8b7bab4c651a0d5fc0"

packages/vira/test/Spec.hs

@@ -0,0 +1 @@
+{-# OPTIONS_GHC -F -pgmF hspec-discover #-}