From d380b9529e8698e9368d775b2705f8970257046b Mon Sep 17 00:00:00 2001 From: MeerKatDev Date: Wed, 28 Apr 2021 10:12:41 +0200 Subject: [PATCH] added and tested assembly (#14) * added and tested assembly * updated run.sh * Use pre-compiled test runner assembly Co-authored-by: Erik Schierboom --- Dockerfile | 2 +- bin/run.sh | 2 +- project/plugins.sbt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 project/plugins.sbt diff --git a/Dockerfile b/Dockerfile index b0a3a53..64cf2e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ WORKDIR /opt/test-runner COPY project/ project/ COPY src/ src/ COPY build.sbt build.sbt -RUN sbt compile +RUN sbt assembly COPY . . diff --git a/bin/run.sh b/bin/run.sh index ae0e6a3..25ffc8d 100755 --- a/bin/run.sh +++ b/bin/run.sh @@ -54,6 +54,6 @@ mv -f "${original_tests_file}" "${tests_file}" popd > /dev/null # Write the results.json file -sbt "set offline := true" "run ${build_log_file} ${tests_results_file} ${results_file}" > "${runner_log_file}" +java -jar target/scala-2.12/TestRunner-assembly-0.1.0-SNAPSHOT.jar "${build_log_file}" "${tests_results_file}" "${results_file}" > "${runner_log_file}" echo "${slug}: done" diff --git a/project/plugins.sbt b/project/plugins.sbt new file mode 100644 index 0000000..72477a2 --- /dev/null +++ b/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")