Inlude tests within the derivation check phase

Miou-zora · May 5, 2024 · 3f95d5a · 3f95d5a
1 parent ee19c92
commit 3f95d5a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 28 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -19,17 +19,6 @@ jobs:
           nix_path: nixpkgs=channel:nixos-unstable
 
       - run: nix build
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - uses: cachix/install-nix-action@v26
-        with:
-          nix_path: nixpkgs=channel:nixos-unstable
-
-      - run: nix develop -c zig build test
   lint:
     runs-on: ubuntu-latest
     steps:

diff --git a/flake.nix b/flake.nix
@@ -32,28 +32,34 @@
             ];
           };
 
-          packages.default = pkgs.stdenv.mkDerivation {
-            name = "Zaytracer";
-            src = ./.;
+          packages.default =
+            pkgs.stdenv.mkDerivation {
+              name = "Zaytracer";
+              src = ./.;
 
-            XDG_CACHE_HOME = "${placeholder "out"}";
+              XDG_CACHE_HOME = "${placeholder "out"}";
 
-            prePatch = ''
-              mkdir -p libs
+              prePatch = ''
+                mkdir -p libs
 
-              cp -r ${zig-gamedev} libs/zgamedev
-            '';
+                cp -r ${zig-gamedev} libs/zgamedev
+              '';
 
-            buildInputs = [ pkgs.raylib ];
-            buildPhase = ''
-              ${pkgs.zig_0_12}/bin/zig build -Doptimize=ReleaseFast
-            '';
+              buildInputs = [ pkgs.raylib ];
+              nativeBuildInputs = [ pkgs.zig_0_12 ];
+              buildPhase = ''
+                zig build -Doptimize=ReleaseFast
+              '';
 
-            installPhase = ''
-              ${pkgs.zig_0_12}/bin/zig build install --prefix $out -Doptimize=ReleaseFast
-              rm -rf $out/zig # remove cache
-            '';
+              doCheck = true;
+              checkPhase = ''
+                zig build test --summary all
+              '';
 
-          };
+              installPhase = ''
+                zig build install --prefix $out -Doptimize=ReleaseFast
+                rm -rf $out/zig # remove cache
+              '';
+            };
         });
 }