ci(bulk-model-sync-gradle): fix ci specific problems

Author: mhuster23

model-sync-gradle-test/build.gradle.kts

@@ -69,6 +69,10 @@ kotlin {
 
 tasks.register("runModelServer", JavaExec::class) {
     group = "modelix"
+
+    description = "Launches a model-server instance to be used as a target for the test. " +
+        "This task will block and is intended to be run in a separate process, apart from the actual test execution."
+
     classpath = sourceSets["main"].runtimeClasspath
     mainClass.set("org.modelix.model.server.Main")
     args("-inmemory")
@@ -96,7 +100,7 @@ modelSync {
         includeModule("GraphSolution")
         fromLocal {
             mpsHome = mpsDir
-            mpsHeapSize = "4g"
+            mpsHeapSize = "2g"
             repositoryDir = repoDir
         }
         toModelServer {

model-sync-gradle-test/ci.sh

@@ -1,35 +1,36 @@
 #!/bin/sh
 
 set -e
-(
-  cd "$(dirname "$0")"
 
-  (
-    cd graph-lang-api
-    ./gradlew publishToMavenLocal --console=plain
-  )
+cd "$(dirname "$0")"
 
-  ./gradlew assemble --console=plain
+(
+  cd graph-lang-api
+  ./gradlew publishToMavenLocal --console=plain
+)
 
+./gradlew assemble --console=plain
+
+if [ "${CI}" != "true" ]; then
   trap cleanup INT TERM EXIT
   cleanup () {
     kill "${MODEL_SERVER_PID}"
     exit
   }
+fi
 
-  ./gradlew runModelServer --console=plain &
-  MODEL_SERVER_PID=$!
-  sleep 5
+./gradlew runModelServer --console=plain &
+MODEL_SERVER_PID=$!
+sleep 5
 
-  #CI needs more time
-  if [ "${CI}" = "true" ]; then
-    sleep 15
-  fi
+#CI needs more time
+if [ "${CI}" = "true" ]; then
+  sleep 10
+fi
 
-  curl -X POST http://127.0.0.1:28101/v2/repositories/ci-test/init
+curl -X POST http://127.0.0.1:28101/v2/repositories/ci-test/init
 
-  ./gradlew runSyncTestPush --console=plain --stacktrace
-  ./gradlew test --tests 'PushTest'
-  ./gradlew runSyncTestPull --console=plain --stacktrace
-  ./gradlew test --tests 'PullTest'
-)
+./gradlew runSyncTestPush --console=plain --stacktrace
+./gradlew test --tests 'PushTest'
+./gradlew runSyncTestPull --console=plain --stacktrace
+./gradlew test --tests 'PullTest'