Split CI

Author: cannorin

.github/workflows/ci.yml

@@ -2,13 +2,13 @@ name: CI
 
 on:
   push:
-    branches: [main]
+    branches: [main,v2]
   pull_request:
-    branches: [main]
+    branches: [main,v2]
   workflow_dispatch:
 
 jobs:
-  build:
+  build-jsoo:
     strategy:
       fail-fast: false
       matrix:
@@ -59,4 +59,40 @@ jobs:
         run: opam install . --deps-only
 
       - name: Run FAKE
-        run: dotnet fake build target Test
+        run: dotnet fake build target TestJsoo
+
+  build-res:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+        dotnet:
+          - 5.0.x
+        node-version:
+          - 16.x
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Use .NET ${{ matrix.dotnet }}
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: ${{ matrix.dotnet }}
+
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: yarn
+
+      - name: Install .NET Dependencies
+        run: |
+          dotnet restore
+          dotnet tool restore
+
+      - name: Run FAKE
+        run: dotnet fake build target TestRes

build.fsx

@@ -41,17 +41,18 @@ let run cmd dir args =
     failwithf "Error while running '%s' with args: %s " cmd args
 
 let platformTool tool =
-  ProcessUtils.tryFindFileOnPath tool
-  |> function Some t -> t | _ -> failwithf "%s not found" tool
+  lazy
+    ProcessUtils.tryFindFileOnPath tool
+    |> function Some t -> t | _ -> failwithf "%s not found" tool
 
 let dotnetExec cmd args =
   let result = DotNet.exec id cmd args
   if not result.OK then
     failwithf "Error while running 'dotnet %s %s'" cmd args
 
 let opamTool = platformTool "opam"
-let opam args = run opamTool "./" args
-let dune args = run opamTool "./" (sprintf "exec -- dune %s" args)
+let opam args = run opamTool.Value "./" args
+let dune args = run opamTool.Value "./" (sprintf "exec -- dune %s" args)
 
 // Build targets
 
@@ -89,27 +90,24 @@ Target.create "Watch" <| fun _ ->
   dotnetExec "fable" $"watch {srcDir} --sourceMaps --define DEBUG --run webpack -w --mode=development"
 
 Target.create "Test" ignore
-Target.create "TestOnly" ignore
-Target.create "TestComplete" ignore
 
 "Clean"
-  ==> "YarnInstall"
+  ?=> "YarnInstall"
   ==> "Restore"
   ==> "Prepare"
-  ==> "Build"
 
-"TestOnly"
-  ==> "TestComplete"
-  ==> "Test"
+"Prepare"
+  ==> "BuildForTest"
 
 "Prepare"
-  ?=> "BuildForTest"
-  ?=> "TestComplete"
-  ?=> "BuildForPublish"
+  ==> "BuildForPublish"
   ==> "Build"
 
 "Prepare"
-  ?=> "Watch"
+  ==> "Test"
+
+"Prepare"
+  ==> "Watch"
 
 // Test targets
 
@@ -226,7 +224,7 @@ Target.create "TestJsoo" ignore
   ==> "TestJsooGenerateBindings"
   ==> "TestJsooBuild"
   ==> "TestJsoo"
-  ==> "TestOnly"
+  ==> "Test"
 
 Target.create "TestResClean" <| fun _ -> Test.Res.clean ()
 Target.create "TestResGenerateBindings" <| fun _ -> Test.Res.generateBindings ()
@@ -238,7 +236,7 @@ Target.create "TestRes" ignore
   ==> "TestResGenerateBindings"
   ==> "TestResBuild"
   ==> "TestRes"
-  ==> "TestOnly"
+  ==> "Test"
 
 // Publish targets
 
@@ -287,7 +285,6 @@ module Publish =
       inDirectory targetDir <| fun () -> dune "build"
 
 Target.create "Publish" <| fun _ -> ()
-Target.create "PublishOnly" <| fun _ -> ()
 
 Target.create "PublishNpm" <| fun _ ->
   Publish.Npm.updateVersion ()
@@ -300,7 +297,6 @@ Target.create "PublishJsoo" <| fun _ ->
 "BuildForPublish"
   ==> "PublishNpm"
   ==> "PublishJsoo"
-  ==> "PublishOnly"
   ==> "Publish"
 
 "TestJsoo" ==> "PublishJsoo"
@@ -309,6 +305,7 @@ Target.create "PublishJsoo" <| fun _ ->
 
 Target.create "All" ignore
 
+"Prepare" ==> "All"
 "Build"
   ==> "Test"
   ==> "Publish"