.github/workflows: adding sanity check step

.github/workflows/CI.yml

@@ -91,6 +91,8 @@ jobs:
       run: ./configure.sh
     - name: build in DEBUG mode
       run: make
+    - name: sanity check
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: dotnet fsi scripts/runUnitTests.fsx
 
@@ -118,6 +120,8 @@ jobs:
       run: ./configure.sh
     - name: build in DEBUG mode
       run: make
+    - name: sanity check
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: fsharpi --define:LEGACY_FRAMEWORK scripts/runUnitTests.fsx
 
@@ -149,6 +153,8 @@ jobs:
       run: ./configure.sh && cat build.config
     - name: build in DEBUG mode
       run: make
+    - name: sanity check
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: dotnet fsi scripts/runUnitTests.fsx
 
@@ -180,6 +186,8 @@ jobs:
       run: ./configure.sh
     - name: build in DEBUG mode
       run: make
+    - name: sanity check
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: dotnet fsi scripts/runUnitTests.fsx
 
@@ -222,6 +230,8 @@ jobs:
       run: ./configure.sh
     - name: build in DEBUG mode
       run: make
+    - name: sanity check
+      run: dotnet fsi scripts/sanitycheck.fsx
 
     - name: install
       run: |
@@ -266,6 +276,8 @@ jobs:
       run: ./configure.sh
     - name: build in DEBUG mode
       run: make
+    - name: sanity check
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: fsharpi --define:LEGACY_FRAMEWORK scripts/runUnitTests.fsx
 
@@ -297,6 +309,8 @@ jobs:
       run: ./configure.sh
     - name: build in DEBUG mode
       run: make
+    - name: sanity check
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: dotnet fsi scripts/runUnitTests.fsx
 
@@ -328,6 +342,8 @@ jobs:
       run: ./configure.sh
     - name: build in DEBUG mode
       run: make
+    - name: sanity check
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: dotnet fsi scripts/runUnitTests.fsx
 
@@ -370,6 +386,8 @@ jobs:
       run: ./configure.sh
     - name: build in DEBUG mode
       run: make
+    - name: sanity check
+      run: dotnet fsi scripts/sanitycheck.fsx
 
     - name: install
       run: |
@@ -414,6 +432,8 @@ jobs:
       run: ./configure.sh
     - name: build in DEBUG mode
       run: make
+    - name: sanity check
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: fsharpi --define:LEGACY_FRAMEWORK scripts/runUnitTests.fsx
 
@@ -452,6 +472,8 @@ jobs:
       run: ./configure.sh
     - name: build in DEBUG mode
       run: make
+    - name: sanity check
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: dotnet fsi scripts/runUnitTests.fsx
 
@@ -477,6 +499,8 @@ jobs:
       run: del $(where.exe dotnet)
     - name: build in DEBUG mode
       run: .\make.bat
+    - name: sanity check
+      run: .\make.bat sanitycheck
     - name: run unit tests
       run: .\Tools\fsi.bat scripts\runUnitTests.fsx
 
@@ -503,6 +527,8 @@ jobs:
         dotnet-version: '6.0.x'
     - name: build in DEBUG mode
       run: .\make.bat
+    - name: sanity check
+      run: .\make.bat sanitycheck
     - name: run unit tests
       run: dotnet fsi scripts/runUnitTests.fsx
 

Makefile

@@ -13,3 +13,6 @@ reinstall:
 
 check:
 	./scripts/runTests.fsx
+
+sanitycheck:
+	@./scripts/build.sh sanitycheck

scripts/build.sh

@@ -1,16 +1,9 @@
 #!/usr/bin/env bash
-set -e
+set -exo pipefail
 
-if [ ! -f ./build.config ]; then
-    echo "Please run ./configure.sh first" >&2
-    exit 1
+BUILD_CONFIG="./build.config"
+if [ ! -f "$BUILD_CONFIG" ]; then
+    echo "ERROR: configure hasn't been run yet, run ./configure.sh first" >&2 && exit 1
 fi
-source build.config
-
-if [[ ! $BuildTool == dotnet* ]]; then
-    mkdir -p .nuget/
-    curl -o .nuget/NuGet.exe https://dist.nuget.org/win-x86-commandline/v5.4.0/nuget.exe
-    mono .nuget/NuGet.exe restore $Solution
-fi
-
-$BuildTool $Solution $1
+source "$BUILD_CONFIG"
+FsxRunnerBin=$FsxRunnerBin FsxRunnerArg=$FsxRunnerArg BuildTool=$BuildTool LegacyBuildTool=$LegacyBuildTool $FsxRunnerBin $FsxRunnerArg ./scripts/make.fsx "$@"

scripts/fsxHelper.fs

@@ -0,0 +1,54 @@
+namespace GWallet.Scripting
+
+open System
+open System.IO
+
+open Fsdk
+open Fsdk.Process
+
+module FsxHelper =
+
+    let ScriptsDir = __SOURCE_DIRECTORY__ |> DirectoryInfo
+    let RootDir = Path.Combine(ScriptsDir.FullName, "..") |> DirectoryInfo
+    let SourceDir = Path.Combine(ScriptsDir.FullName, "../src/") |> DirectoryInfo
+    let NugetDir = Path.Combine (RootDir.FullName, ".nuget") |> DirectoryInfo
+    let NugetExe = Path.Combine (NugetDir.FullName, "nuget.exe") |> FileInfo
+    let NugetSolutionPackagesDir = Path.Combine(RootDir.FullName, "packages") |> DirectoryInfo
+    let NugetScriptsPackagesDir() =
+        let dir = Path.Combine(NugetDir.FullName, "packages") |> DirectoryInfo
+        if not dir.Exists then
+            Directory.CreateDirectory dir.FullName
+            |> ignore
+        dir
+
+    let AreGtkLibsPresent echoMode =
+        if Misc.GuessPlatform() <> Misc.Platform.Linux then
+            failwith "Gtk is only supported in Linux"
+
+        let pkgConfigForGtkProc = Process.Execute({ Command = "pkg-config"; Arguments = "gtk-sharp-2.0" }, echoMode)
+        match pkgConfigForGtkProc.Result with
+        | Error _ -> false
+        | _ -> true
+
+    let FsxRunnerInfo() =
+        match Misc.GuessPlatform() with
+        | Misc.Platform.Windows ->
+#if !LEGACY_FRAMEWORK
+            "dotnet", "fsi"
+#else
+            Path.Combine(ScriptsDir.FullName, "fsx", "Tools", "fsi.bat"), String.Empty
+#endif
+        | _ ->
+            let fsxRunnerBinEnvVar = Environment.GetEnvironmentVariable "FsxRunnerBin"
+            let fsxRunnerArgEnvVar = Environment.GetEnvironmentVariable "FsxRunnerArg"
+            if String.IsNullOrEmpty fsxRunnerBinEnvVar then
+                let msg = "FsxRunnerBin env var not found, it should have been sourced from build.config file"
+                let msgFull =
+                    msg + Environment.NewLine +
+                    (sprintf "(maybe you 1. %s, or 2. %s, or 3. %s)"
+                        "called this from configure.fsx (which is not supported, just use this func from make.fsx or sanitycheck.fsx)"
+                        "you meant to run a Makefile target rather than this script directly?"
+                        "there is a .sh wrapper script for your .fsx script"
+                    )
+                failwith msgFull
+            fsxRunnerBinEnvVar, fsxRunnerArgEnvVar

scripts/make.fsx

@@ -362,6 +362,34 @@ match maybeTarget with
     | "0" -> ()
     | _ -> failwith "Unexpected output from tests (error propagation)"
 
+| Some "sanitycheck" ->
+
+#if LEGACY_FRAMEWORK
+    if not FsxHelper.NugetExe.Exists then
+        MakeAll None |> ignore
+
+    let microsoftBuildLibVersion = "16.11.0"
+    let pkgOutputDir = FsxHelper.NugetScriptsPackagesDir()
+    Network.InstallNugetPackage
+        FsxHelper.NugetExe
+        pkgOutputDir
+        "Microsoft.Build"
+        (Some microsoftBuildLibVersion)
+        Echo.All
+    |> ignore
+
+#endif
+
+    let sanityCheckScript = Path.Combine(FsxHelper.ScriptsDir.FullName, "sanitycheck.fsx")
+    let fsxRunnerBin,fsxRunnerArg = FsxHelper.FsxRunnerInfo()
+    Process.Execute(
+        {
+            Command = fsxRunnerBin
+            Arguments = sprintf "%s %s" fsxRunnerArg sanityCheckScript
+        },
+        Echo.All
+    ).UnwrapDefault() |> ignore<string>
+
 | Some someOtherTarget ->
     Console.Error.WriteLine("Unrecognized target: " + someOtherTarget)
     Environment.Exit 1