Add more CI build targets (#771)

- Adds more CI jobs

.github/workflows/main.yml

@@ -27,8 +27,31 @@ jobs:
          signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
      - name: Dependency install
        run: nix-build -A pkgs.yarn default.nix && nix-env -i ./result
-     - name: Miso build
-       run: nix-build -j1
+
+     - name: (JS) Miso GHCJS
+       run: nix-build -A miso-ghcjs
+
+     - name: (x86) Miso GHC
+       run: nix-build -A miso-ghc
+
+     - name: (x86) Haskell-miso.org server
+       run: nix-build -A haskell-miso-server
+
+     - name: (JS) Haskell-miso.org client
+       run: nix-build -A haskell-miso-client
+
+     - name: (JS) Miso examples
+       run: nix-build -A miso-examples
+
+     - name: (x86) Miso examples
+       run: nix-build -A miso-examples-ghc
+
+     - name: (JS) Miso sample app
+       run: nix-build -A sample-app 
+
+     - name: (x86) Miso sample app jsaddle
+       run: nix-build -A sample-app-jsaddle
+
      - name: Diffing tests
        run: cd tests && yarn && yarn test
 

default.nix

@@ -37,7 +37,10 @@ in
   inherit release release-examples;
 
   #website
-  inherit (pkgs) haskell-miso;
+  inherit (pkgs)
+    haskell-miso-client
+    haskell-miso-server
+    haskell-miso-runner;
 
   #ci
   deploy = pkgs.deploy rev;

haskell-miso.org/client/shell.nix

@@ -1,7 +1,2 @@
 with (import ../../default.nix {});
-let
-  inherit (pkgs.haskell.packages) ghcjs86;
-  src = import ../../nix/haskell/packages/source.nix pkgs;
-  client = ghcjs86.callCabal2nix "haskell-miso" (src.haskell-miso-src) {};
-in
-  client.env
+haskell-miso-client.env

haskell-miso.org/default.nix

@@ -7,12 +7,16 @@ let
   client = ghcjs86.callCabal2nix "haskell-miso" (src.haskell-miso-src) {};
   server = ghc865.callCabal2nix "haskell-miso" (src.haskell-miso-src) {};
 in
-  runCommand "haskell-miso.org" { inherit client server; } ''
-    mkdir -p $out/{bin,static}
-    cp ${server}/bin/* $out/bin
-    ${closurecompiler}/bin/closure-compiler --compilation_level ADVANCED_OPTIMIZATIONS \
-      --jscomp_off=checkVars \
-      --externs=${client}/bin/client.jsexe/all.js.externs \
-      ${client}/bin/client.jsexe/all.js > temp.js
-    mv temp.js $out/static/all.js
-  ''
+{ haskell-miso-client = client;
+  haskell-miso-server = server;
+  haskell-miso-runner = 
+    runCommand "haskell-miso.org" { inherit client server; } ''
+      mkdir -p $out/{bin,static}
+      cp ${server}/bin/* $out/bin
+      ${closurecompiler}/bin/closure-compiler --compilation_level ADVANCED_OPTIMIZATIONS \
+        --jscomp_off=checkVars \
+        --externs=${client}/bin/client.jsexe/all.js.externs \
+        ${client}/bin/client.jsexe/all.js > temp.js
+      mv temp.js $out/static/all.js
+    '';
+}

haskell-miso.org/nix/module.nix

@@ -5,7 +5,10 @@ in {
    options.services.haskell-miso.enable = lib.mkEnableOption "Enable the haskell-miso.org service";
    config = lib.mkIf cfg.enable {
      systemd.services.haskell-miso = {
-       path = with pkgs; [ haskell-miso bash ];
+       path = with pkgs;
+         [ misoPkgs.haskell-miso-runner 
+           bash
+         ];
        wantedBy = [ "multi-user.target" ];
        script = ''
          ./bin/server +RTS -N -A4M -RTS

haskell-miso.org/server/shell.nix

@@ -1,7 +1,2 @@
 with (import ../../default.nix {});
-let
-  inherit (pkgs.haskell.packages) ghc865;
-  src = import ../../nix/haskell/packages/source.nix pkgs;
-  server = ghc865.callCabal2nix "haskell-miso" (src.haskell-miso-src) {};
-in
-  server.env
+haskell-miso-server.env

nix/overlay.nix

@@ -3,8 +3,11 @@ options: self: super: {
   sample-app-jsaddle =
     (import ../sample-app-jsaddle self).release;
 
-  haskell-miso =
-    import ../haskell-miso.org {};
+  inherit (import ../haskell-miso.org {})
+    haskell-miso-client
+    haskell-miso-server
+    haskell-miso-runner;
+
   haskell = super.haskell // {
     packages = super.haskell.packages // {
       ghc865 = super.haskell.packages.ghc865.override {
@@ -42,7 +45,7 @@ options: self: super: {
     nixops import < deploy.json
     rm deploy.json
     nixops set-args --argstr email $EMAIL -d haskell-miso
-    nixops modify haskell-miso.org/nix/aws.nix -d haskell-miso \
+    nixops modify haskell-miso.org/nix/server.nix -d haskell-miso \
       -Inixpkgs=https://github.com/nixos/nixpkgs/archive/6d1a044fc9ff3cc96fca5fa3ba9c158522bbf2a5.tar.gz
     nix --version
     # https://github.com/NixOS/nixops/issues/1557