Fix version test with release currently building

smith-chem-wisc · Aug 2, 2021 · 915cfcd · 915cfcd
1 parent fcf95eb
commit 915cfcd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,10 +22,10 @@ jobs:
     - name: Restore dependencies
       run: dotnet restore Spritz/Spritz.sln
 
-    - name: Build
+    - name: Build .NET
       run: dotnet build --no-restore --configuration Release /p:Platform=x64 Spritz/Spritz.sln
 
-    - name: Test
+    - name: Test .NET
       run: dotnet test --no-build --configuration Release --verbosity normal Spritz/Spritz.sln
 
     - name: Setup msbuild
@@ -47,11 +47,11 @@ jobs:
     - name: Restore dependencies
       run: dotnet restore Spritz/SpritzCMD/SpritzCMD.csproj
 
-    - name: Build
+    - name: Build SpritzCMD
       run: dotnet build --no-restore /p:Platform=x64 --configuration Release Spritz/SpritzCMD/SpritzCMD.csproj
 
     - name: Build docker image
       run: docker build -t spritz ./Spritz/
 
-    - name: Run test
+    - name: Run test in docker image
       run: docker run --user=root spritz /opt/conda/lib/dotnet/dotnet SpritzCMD.dll -bd -a=/app/spritz/results/ -r="release-96,saccharomyces_cerevisiae,baker's yeast,R64-1-1" -s=SRR13737862
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -80,10 +80,7 @@ jobs:
     - name: Restore dependencies
       run: dotnet restore Spritz/SpritzCMD/SpritzCMD.csproj
 
-    - name: Build
-      run: dotnet build --no-restore /p:Platform=x64 --configuration Release Spritz/SpritzCMD/SpritzCMD.csproj
-
-    - name: Build
+    - name: Build SpritzCMD
       run: dotnet build --no-restore /p:Platform=x64 --configuration Release Spritz/SpritzCMD/SpritzCMD.csproj
 
     - name: Build docker image

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ Spritz uses snakemake and Docker to install and run commandline tools for Next-G
 
 * Environment:
   * Windows 10 recommended
-  * [.NET Core 3.1](https://dotnet.microsoft.com/download/dotnet-core/thank-you/runtime-desktop-3.1.3-windows-x64-installer)
+  * [.NET Core 5.0](https://dotnet.microsoft.com/download/dotnet/thank-you/runtime-5.0.8-windows-x64-installer)
 * 24 GB RAM recommended
 * The installer ([Spritz.msi](https://github.com/smith-chem-wisc/Spritz/releases)) only works on Windows.
 

diff --git a/Spritz/SpritzTest/SpritzVersionTests.cs b/Spritz/SpritzTest/SpritzVersionTests.cs
@@ -30,7 +30,10 @@ public void TestVersionHigher()
         {
             SpritzVersion version = new();
             version.GetVersionNumbersFromWeb();
-            Assert.IsTrue(SpritzVersion.IsVersionLower( version.NewestKnownVersionWithMsi));
+            bool inReleaseOrlowerVersion =
+                version.NewestKnownVersion == RunnerEngine.CurrentVersion && version.NewestKnownVersionWithMsi == null 
+                || SpritzVersion.IsVersionLower(version.NewestKnownVersionWithMsi);
+            Assert.IsTrue(inReleaseOrlowerVersion);
         }
 
         [Test]