Skip to content

Building without evomaster #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
omursahin wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Building without evomaster #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions jdk_11_gradle/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
}
6 changes: 4 additions & 2 deletions jdk_17_gradle/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
}
7 changes: 5 additions & 2 deletions jdk_8_gradle/settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
}
6 changes: 3 additions & 3 deletions scripts/build/docker-compose.build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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/
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/dist-docker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down