build: remove 'v' from version number, disable flakey tests (#2503)

* build: remove 'v' from version number, disable flakey tests * fix so python also still works * explain @disabled tests
molgenis · Jul 5, 2023 · 49a1b7f · 49a1b7f
1 parent 68f213f
commit 49a1b7f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/backend/molgenis-emx2-webapi/src/test/java/org.molgenis.emx2.web/WebApiSmokeTests.java b/backend/molgenis-emx2-webapi/src/test/java/org.molgenis.emx2.web/WebApiSmokeTests.java
@@ -340,6 +340,7 @@ private byte[] getContentAsByteArray(String fileType, String path) {
   }
 
   @Test
+  @Disabled("unstable")
   public void testJsonYamlApi() {
     String schemaJson = given().sessionId(SESSION_ID).when().get("/pet store/api/json").asString();
 
@@ -914,7 +915,7 @@ private Response downloadPet(String requestString) {
   }
 
   @Test
-  @Disabled
+  @Disabled("unstable")
   public void testScriptExecution() throws JsonProcessingException, InterruptedException {
     // get token for admin
     String result =
@@ -1129,6 +1130,7 @@ public void testScriptScheduling() throws JsonProcessingException, InterruptedEx
   }
 
   @Test
+  @Disabled("unstable")
   public void testBeaconApiSmokeTests() {
     // todo: ideally we would here validate the responses against json schemas, are those schemas
     // easily available?

diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,9 @@ plugins {
 }
 
 allprojects {
-    if(rootProject.nyxState.releaseScope.previousVersion == rootProject.version) {
+    if(rootProject.nyxState.releaseScope.previousVersion == rootProject.version ||
+        //temporarily also compare to 'v' because we are remove this prefix
+        rootProject.nyxState.releaseScope.previousVersion == "v" + rootProject.version ) {
         version = rootProject.nyxState.releaseScope.previousVersion + "-SNAPSHOT"
     }
     else {

diff --git a/settings.gradle b/settings.gradle
@@ -8,7 +8,7 @@ plugins {
 nyx {
     verbosity = "INFO"
     preset = "simple"
-    releasePrefix = "v"
+    releasePrefix = ""
     releaseTypes {
         items {
             mainline {

diff --git a/tools/build.gradle b/tools/build.gradle
@@ -7,9 +7,9 @@ subprojects {
         if(version.toString().contains("SNAPSHOT")) {
             //must comply with https://peps.python.org/pep-0440/
             //todo: can we somehow include the github hash?
-            new File(projectDir, "version.txt").text = version.replace("-SNAPSHOT","").replace("v","") + ".dev" + new Date().getTime()
+            new File(projectDir, "version.txt").text = version.replace("-SNAPSHOT","") + ".dev" + new Date().getTime()
         } else {
-            new File(projectDir, "version.txt").text = version.replace("v","")
+            new File(projectDir, "version.txt").text = version
         }
         group 'build'
         description 'run python lib build'