Merge pull request #167 from WebFuzzing/gradle-evomaster-exclude

Building without evomaster

Author: arcuri82

.github/workflows/ci.yaml

@@ -9,19 +9,17 @@ on:
 
 jobs:
 
-# TODO need to use profiles to avoid dependencies to EM in the build... would work on master, but not on develop due to snapshot versions
-#  docker-build:
-#    # this one doesn't use EvoMaster drivers
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout WFD
-#        uses: actions/checkout@v6
-#      - name: Build All With Docker
-#        run: python scripts/dist-docker.py
+  docker-build:
+    # this one doesn't use EvoMaster drivers by default
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout WFD
+        uses: actions/checkout@v6
+      - name: Build All With Docker
+        run: python scripts/dist-docker.py
 
   direct-builds:
-#    TODO put back once issue fixed
-#    needs: docker-build
+    needs: docker-build
     runs-on:  ${{ matrix.os }}
     strategy:
       matrix:

jdk_11_gradle/settings.gradle.kts

@@ -1,9 +1,11 @@
 rootProject.name = "emb_jdk_11_gradle"
 
 include("cs:graphql:patio-api")
-include("em:embedded:graphql:patio-api")
-include("em:external:graphql:patio-api")
-
 include("cs:rest:reservations-api")
-include("em:embedded:rest:reservations-api")
-include("em:external:rest:reservations-api")
+
+if (System.getenv("BUILD_EVOMASTER") != "false") {
+    include("em:embedded:graphql:patio-api")
+    include("em:external:graphql:patio-api")
+    include("em:embedded:rest:reservations-api")
+    include("em:external:rest:reservations-api")
+}

jdk_17_gradle/settings.gradle.kts

@@ -1,6 +1,8 @@
 rootProject.name = "emb_jdk_17_gradle"
 
 include("cs:rest:bibliothek")
-include("em:embedded:rest:bibliothek")
-include("em:external:rest:bibliothek")
 
+if (System.getenv("BUILD_EVOMASTER") != "false") {
+    include("em:embedded:rest:bibliothek")
+    include("em:external:rest:bibliothek")
+}

jdk_8_gradle/settings.gradle.kts

@@ -1,5 +1,8 @@
 rootProject.name = "emb_jdk_8_gradle"
 
 include("cs:rest:erc20-rest-service")
-include("em:embedded:rest:erc20-rest-service")
-include("em:external:rest:erc20-rest-service")
+
+if (System.getenv("BUILD_EVOMASTER") != "false") {
+    include("em:embedded:rest:erc20-rest-service")
+    include("em:external:rest:erc20-rest-service")
+}

scripts/build/docker-compose.build.yml

@@ -96,7 +96,7 @@ services:
         if [ "$${BUILD_EVOMASTER:-false}" = "true" ]; then
           gradle build -x test
         else
-          (cd cs && gradle build -x test)
+          gradle build -x test
         fi
         cp cs/rest/erc20-rest-service/build/libs/erc20-rest-service-sut.jar /dist/
         if [ "$${BUILD_EVOMASTER:-false}" = "true" ]; then
@@ -161,7 +161,7 @@ services:
         if [ "$${BUILD_EVOMASTER:-false}" = "true" ]; then
           gradle build -x test
         else
-          (cd cs && gradle build -x test)
+          gradle build -x test
         fi
         cp cs/graphql/patio-api/build/libs/patio-api-sut.jar /dist/
         cp cs/rest/reservations-api/build/libs/reservations-api-sut.jar /dist/
@@ -226,7 +226,7 @@ services:
         if [ "$${BUILD_EVOMASTER:-false}" = "true" ]; then
           gradle build -x test -x spotlessCheck -x spotlessJavaCheck
         else
-          (cd cs && gradle build -x test -x spotlessCheck -x spotlessJavaCheck)
+          gradle build -x test -x spotlessCheck -x spotlessJavaCheck
         fi
         cp cs/rest/bibliothek/build/libs/bibliothek-sut.jar /dist/
         if [ "$${BUILD_EVOMASTER:-false}" = "true" ]; then

scripts/dist-docker.py

@@ -59,7 +59,7 @@ def run(cmd, check=True):
 
 
 def run_build(compose, service, *, background=False, evomaster=False):
-    env_args = ["-e", "BUILD_EVOMASTER=true"] if evomaster else []
+    env_args = ["-e", f"BUILD_EVOMASTER={'true' if evomaster else 'false'}"]
     cmd = compose + ["-f", COMPOSE_FILE, "run", "--rm", "-T"] + env_args + [service]
     if background:
         return subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)