Skip to content

Commit 09a9ea5

Browse files
committed
gradle without evomaster
1 parent 2007849 commit 09a9ea5

File tree

5 files changed

+20
-13
lines changed

5 files changed

+20
-13
lines changed

jdk_11_gradle/settings.gradle.kts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
rootProject.name = "emb_jdk_11_gradle"
22

33
include("cs:graphql:patio-api")
4-
include("em:embedded:graphql:patio-api")
5-
include("em:external:graphql:patio-api")
6-
74
include("cs:rest:reservations-api")
8-
include("em:embedded:rest:reservations-api")
9-
include("em:external:rest:reservations-api")
5+
6+
if (System.getenv("BUILD_EVOMASTER") != "false") {
7+
include("em:embedded:graphql:patio-api")
8+
include("em:external:graphql:patio-api")
9+
include("em:embedded:rest:reservations-api")
10+
include("em:external:rest:reservations-api")
11+
}

jdk_17_gradle/settings.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
rootProject.name = "emb_jdk_17_gradle"
22

33
include("cs:rest:bibliothek")
4-
include("em:embedded:rest:bibliothek")
5-
include("em:external:rest:bibliothek")
64

5+
if (System.getenv("BUILD_EVOMASTER") != "false") {
6+
include("em:embedded:rest:bibliothek")
7+
include("em:external:rest:bibliothek")
8+
}

jdk_8_gradle/settings.gradle.kts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
rootProject.name = "emb_jdk_8_gradle"
22

33
include("cs:rest:erc20-rest-service")
4-
include("em:embedded:rest:erc20-rest-service")
5-
include("em:external:rest:erc20-rest-service")
4+
5+
if (System.getenv("BUILD_EVOMASTER") != "false") {
6+
include("em:embedded:rest:erc20-rest-service")
7+
include("em:external:rest:erc20-rest-service")
8+
}

scripts/build/docker-compose.build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ services:
9696
if [ "$${BUILD_EVOMASTER:-false}" = "true" ]; then
9797
gradle build -x test
9898
else
99-
(cd cs && gradle build -x test)
99+
gradle build -x test
100100
fi
101101
cp cs/rest/erc20-rest-service/build/libs/erc20-rest-service-sut.jar /dist/
102102
if [ "$${BUILD_EVOMASTER:-false}" = "true" ]; then
@@ -161,7 +161,7 @@ services:
161161
if [ "$${BUILD_EVOMASTER:-false}" = "true" ]; then
162162
gradle build -x test
163163
else
164-
(cd cs && gradle build -x test)
164+
gradle build -x test
165165
fi
166166
cp cs/graphql/patio-api/build/libs/patio-api-sut.jar /dist/
167167
cp cs/rest/reservations-api/build/libs/reservations-api-sut.jar /dist/
@@ -226,7 +226,7 @@ services:
226226
if [ "$${BUILD_EVOMASTER:-false}" = "true" ]; then
227227
gradle build -x test -x spotlessCheck -x spotlessJavaCheck
228228
else
229-
(cd cs && gradle build -x test -x spotlessCheck -x spotlessJavaCheck)
229+
gradle build -x test -x spotlessCheck -x spotlessJavaCheck
230230
fi
231231
cp cs/rest/bibliothek/build/libs/bibliothek-sut.jar /dist/
232232
if [ "$${BUILD_EVOMASTER:-false}" = "true" ]; then

scripts/dist-docker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def run(cmd, check=True):
5959

6060

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

0 commit comments

Comments
 (0)