Run tests in MacOS's CI pipeline

.github/workflows/main.yml

@@ -71,7 +71,7 @@ jobs:
         nix-env --uninstall codd
 
     - name: Run tests
-      run: nix develop .#shellWithRunfile.x86_64-linux -c run ci-tests
+      run: nix develop .#shellWithRunfile -c run ci-tests
 
     - name: Run benchmarks
       run: nix run ".#x86_64-unknown-linux-musl:codd:bench:codd-bench"
@@ -121,6 +121,12 @@ jobs:
     - name: Build codd without static linking
       run: nix build --no-link ".#codd:exe:codd"
 
+    - name: Build statically linked codd's tests
+      run: nix build --no-link ".#codd:test:codd-test"
+
+    - name: Run tests
+      run: nix develop .#shellWithRunfile -c run test-no-db --nix
+
     - name: Create macOS app bundle
       run: |
         nix build .#coddDarwinAppBundle.aarch64-darwin

Runfile

@@ -68,7 +68,9 @@ test-no-db:
         # This Run command is used insire pure Nix shells where `nix` is not available. That's why
         # this option is useful.
         if [ -z "$NONIXBUILD" ]; then
-            nix build ".#x86_64-unknown-linux-musl:codd:test:codd-test" -o local/codd-test
+            TARGET=".#x86_64-unknown-linux-musl:codd:test:codd-test"
+            [[ "$(uname -s)" == *"Darwin"* ]] && TARGET=".#codd:test:codd-test"
+            nix build "$TARGET" -o local/codd-test
         fi
 
         "${STRACECMD[@]}" ./local/codd-test/bin/codd-test "${TARGS[@]}"
@@ -92,12 +94,14 @@ test-with-db:
 
     # Build the test executable only once with Nix
     if [ -n "$NIX" ]; then
-        nix build ".#x86_64-unknown-linux-musl:codd:test:codd-test" -o local/codd-test
+        TARGET=".#x86_64-unknown-linux-musl:codd:test:codd-test"
+        [[ "$(uname -s)" == *"Darwin"* ]] && TARGET=".#codd:test:codd-test"
+        nix build "$TARGET" -o local/codd-test
     fi
 
     for pg in "${PG[@]}"; do
         echo "Running tests on Postgres $pg"
-        nix develop ".#testShells.x86_64-linux.pg${pg}" "${NIXDEVARGS[@]}" -c run test-with-db-internal "${NIXA[@]}" -- "${TARGS[@]}"
+        nix develop ".#pg${pg}" "${NIXDEVARGS[@]}" -c run test-with-db-internal "${NIXA[@]}" -- "${TARGS[@]}"
     done
 
 ##
@@ -130,9 +134,9 @@ test-system-resources:
 
     if [ -n "$NIX" ]; then
         nix build ".#x86_64-unknown-linux-musl:codd:test:codd-test" -o local/codd-test
-        nix develop ".#testShells.x86_64-linux.pg16" -i -c run test-with-db-internal --strace --nix -- --match "/SystemResourcesSpecs/RUNNING"
-        nix develop ".#testShells.x86_64-linux.pg16" -i -c run test-with-db-internal --nix -- --match "/SystemResourcesSpecs/CHECKING"
+        nix develop ".#pg16" -i -c run test-with-db-internal --strace --nix -- --match "/SystemResourcesSpecs/RUNNING"
+        nix develop ".#pg16" -i -c run test-with-db-internal --nix -- --match "/SystemResourcesSpecs/CHECKING"
     else
-        nix develop ".#testShells.x86_64-linux.pg16" -c run test-with-db-internal --strace -- --match "/SystemResourcesSpecs/RUNNING"
-        nix develop ".#testShells.x86_64-linux.pg16" -c run test-with-db-internal -- --match "/SystemResourcesSpecs/CHECKING"
+        nix develop ".#pg16" -c run test-with-db-internal --strace -- --match "/SystemResourcesSpecs/RUNNING"
+        nix develop ".#pg16" -c run test-with-db-internal -- --match "/SystemResourcesSpecs/CHECKING"
     fi

flake.nix

@@ -144,17 +144,16 @@
         # Built by `nix build .`
         defaultPackage = flakeDefault.packages."codd:exe:codd";
 
-        testShells = {
+        devShells = flakeDefault.devShells // {
           pg12 = import ./nix/test-shell-pg12.nix { inherit pkgs; };
           pg13 = import ./nix/test-shell-pg13.nix { inherit pkgs; };
           pg14 = import ./nix/test-shell-pg14.nix { inherit pkgs; };
           pg15 = import ./nix/test-shell-pg15.nix { inherit pkgs; };
           pg16 = import ./nix/test-shell-pg16.nix { inherit pkgs; };
+          shellWithRunfile =
+            pkgs.mkShell { buildInputs = [ pkgs.run pkgs.shellcheck ]; };
         };
 
-        shellWithRunfile =
-          pkgs.mkShell { buildInputs = [ pkgs.run pkgs.shellcheck ]; };
-
         # Having pkgs helps debug musl builds with `nix repl`. We can e.g.
         # build musl packages statically to see if their "normal" builds pass
         inherit pkgs;