WIP: testing CI

Mersho · Oct 19, 2023 · fdc0dd9 · fdc0dd9
1 parent 35fce11
commit fdc0dd9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -92,7 +92,7 @@ jobs:
     - name: build in DEBUG mode
       run: make
     - name: sanity check
-      run: dotnet fsi scripts\sanitycheck.fsx
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: dotnet fsi scripts/runUnitTests.fsx
 
@@ -121,7 +121,7 @@ jobs:
     - name: build in DEBUG mode
       run: make
     - name: sanity check
-      run: dotnet fsi scripts\sanitycheck.fsx
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: fsharpi --define:LEGACY_FRAMEWORK scripts/runUnitTests.fsx
 
@@ -154,7 +154,7 @@ jobs:
     - name: build in DEBUG mode
       run: make
     - name: sanity check
-      run: dotnet fsi scripts\sanitycheck.fsx
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: dotnet fsi scripts/runUnitTests.fsx
 
@@ -187,7 +187,7 @@ jobs:
     - name: build in DEBUG mode
       run: make
     - name: sanity check
-      run: dotnet fsi scripts\sanitycheck.fsx
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: dotnet fsi scripts/runUnitTests.fsx
 
@@ -231,7 +231,7 @@ jobs:
     - name: build in DEBUG mode
       run: make
     - name: sanity check
-      run: dotnet fsi scripts\sanitycheck.fsx
+      run: dotnet fsi scripts/sanitycheck.fsx
 
     - name: install
       run: |
@@ -277,7 +277,7 @@ jobs:
     - name: build in DEBUG mode
       run: make
     - name: sanity check
-      run: dotnet fsi scripts\sanitycheck.fsx
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: fsharpi --define:LEGACY_FRAMEWORK scripts/runUnitTests.fsx
 
@@ -310,7 +310,7 @@ jobs:
     - name: build in DEBUG mode
       run: make
     - name: sanity check
-      run: dotnet fsi scripts\sanitycheck.fsx
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: dotnet fsi scripts/runUnitTests.fsx
 
@@ -343,7 +343,7 @@ jobs:
     - name: build in DEBUG mode
       run: make
     - name: sanity check
-      run: dotnet fsi scripts\sanitycheck.fsx
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: dotnet fsi scripts/runUnitTests.fsx
 
@@ -387,7 +387,7 @@ jobs:
     - name: build in DEBUG mode
       run: make
     - name: sanity check
-      run: dotnet fsi scripts\sanitycheck.fsx
+      run: dotnet fsi scripts/sanitycheck.fsx
 
     - name: install
       run: |
@@ -433,7 +433,7 @@ jobs:
     - name: build in DEBUG mode
       run: make
     - name: sanity check
-      run: dotnet fsi scripts\sanitycheck.fsx
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: fsharpi --define:LEGACY_FRAMEWORK scripts/runUnitTests.fsx
 
@@ -473,7 +473,7 @@ jobs:
     - name: build in DEBUG mode
       run: make
     - name: sanity check
-      run: dotnet fsi scripts\sanitycheck.fsx
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: dotnet fsi scripts/runUnitTests.fsx
 
@@ -500,7 +500,7 @@ jobs:
     - name: build in DEBUG mode
       run: .\make.bat
     - name: sanity check
-      run: .\make.bat sanitycheck
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: .\Tools\fsi.bat scripts\runUnitTests.fsx
 
@@ -528,7 +528,7 @@ jobs:
     - name: build in DEBUG mode
       run: .\make.bat
     - name: sanity check
-      run: .\make.bat sanitycheck
+      run: dotnet fsi scripts/sanitycheck.fsx
     - name: run unit tests
       run: dotnet fsi scripts/runUnitTests.fsx
 

diff --git a/scripts/sanitycheck.fsx b/scripts/sanitycheck.fsx
@@ -422,10 +422,10 @@ let SanityCheckNugetPackages () =
     //let solutions = Directory.GetCurrentDirectory() |> DirectoryInfo |> findSolutions
     //NOTE: we hardcode the solutions rather than the line above, because e.g. Linux OS can't build/restore iOS proj
     let solutionFileNames = [
-        Path.Combine(FsxHelper.SourceDir.FullName, "gwallet.linux-legacy.sln")
-        Path.Combine(FsxHelper.SourceDir.FullName, "gwallet.mac-legacy.sln")
-        Path.Combine(FsxHelper.SourceDir.FullName, "gwallet.core-legacy.sln")
-        Path.Combine(FsxHelper.SourceDir.FullName, "gwallet.core.sln")
+        Path.Combine(FsxHelper.SourceDir.FullName, "../src/gwallet.linux-legacy.sln")
+        Path.Combine(FsxHelper.SourceDir.FullName, "../src/gwallet.mac-legacy.sln")
+        Path.Combine(FsxHelper.SourceDir.FullName, "../src/gwallet.core-legacy.sln")
+        Path.Combine(FsxHelper.SourceDir.FullName, "../src/gwallet.core.sln")
     ]
 
     let solutionFiles = solutionFileNames |> List.map FileInfo