Skip to content

Commit

Permalink
Use pre-compiled test runner assembly
Browse files Browse the repository at this point in the history
  • Loading branch information
ErikSchierboom committed Apr 28, 2021
1 parent bbd223a commit 7a1ccf3
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ WORKDIR /opt/test-runner
COPY project/ project/
COPY src/ src/
COPY build.sbt build.sbt
RUN sbt compile
RUN sbt assembly
RUN chmod +x target/scala-2.12/TestRunner-assembly-0.1.0-SNAPSHOT.jar

COPY . .

Expand Down
4 changes: 1 addition & 3 deletions bin/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ mv -f "${original_tests_file}" "${tests_file}"
popd > /dev/null

# Write the results.json file
# sbt "set offline := true"

java -jar "target/scala-2.13/TestRunner-assembly-0.1.0-SNAPSHOT.jar ${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"
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Dependencies._

ThisBuild / scalaVersion := "2.13.5"
ThisBuild / scalaVersion := "2.12.8"
ThisBuild / version := "0.1.0-SNAPSHOT"
ThisBuild / organization := "org.exercism"
ThisBuild / organizationName := "exercism"
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import sbt._

object Dependencies {
lazy val scalaTest = "org.scalatest" %% "scalatest" % "3.0.8"
lazy val scalaTest = "org.scalatest" %% "scalatest" % "3.0.1"
}

0 comments on commit 7a1ccf3

Please sign in to comment.