Fix CI

Author: chivay

.github/workflows/main.yml

@@ -7,19 +7,13 @@ on:
 jobs:
   build:
     name: Build the kernel
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - run: mkdir build
-      - uses: cachix/install-nix-action@v13
-        with:
-          install_url: https://nixos-nix-install-tests.cachix.org/serve/i6laym9jw3wg9mw6ncyrk6gjx4l34vvx/install
-          install_options: '--tarball-url-prefix https://nixos-nix-install-tests.cachix.org/serve'
-          extra_nix_config: |
-            experimental-features = nix-command flakes ca-references
-      - uses: cachix/cachix-action@v10
+      - uses: actions/checkout@v3
+      - uses: cachix/install-nix-action@v20
+      - uses: cachix/cachix-action@v12
         with:
           name: vmt
           extraPullNames: zig-nightly
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-      - run: nix build .#vmt
+      - run: nix build

flake.nix

@@ -18,23 +18,20 @@
           vmtZig = zigpkgs."master";
         in
         {
+          defaultPackage = self.outputs.packages.${system}.vmt;
           packages.vmt = pkgs.stdenv.mkDerivation {
             name = "vmt";
-            nativeBuildInputs = [ vmtZig ];
+            nativeBuildInputs = with pkgs; [ vmtZig grub2 xorriso ];
             src = self;
 
             buildPhase = ''
               export HOME=$TMPDIR;
-              zig build kernel
-            '';
-
-            doCheck = true;
-            checkPhase = ''
-              zig test kernel/kernel.zig
+              zig build iso
             '';
 
             installPhase = ''
-              cp -r ./build/x86_64/kernel $out
+              mkdir -p $out
+              cp -r ./build/kernel.iso $out/kernel.iso
             '';
 
           };

kernel/kernel.zig

@@ -30,6 +30,3 @@ comptime {
     _ = arch.x86.multiboot;
 }
 
-test {
-    _ = mm;
-}

kernel/mm.zig

@@ -121,25 +121,6 @@ fn AddrWrapper(comptime name: []const u8, comptime T: type) type {
     };
 }
 
-test "AddrWrapper" {
-    const expect = std.testing.expect;
-
-    const Addr = AddrWrapper("TestAddr", u64);
-
-    const v1 = Addr.new(0x1000);
-    const v2 = Addr.new(0x2000);
-
-    try expect(v1.add(0x1000).eq(v2));
-    try expect(v2.sub(0x1000).eq(v1));
-
-    try expect(v1.le(v1));
-    try expect(v2.eq(v2));
-
-    try expect(Addr.span(v1, v2) == 0x1000);
-
-    try expect(v1.max(v2).eq(v2));
-}
-
 pub const VirtualAddress = AddrWrapper("VirtualAddress", arch.mm.VirtAddrType);
 pub const PhysicalAddress = AddrWrapper("PhysicalAddress", arch.mm.PhysAddrType);