Skip to content

Commit 49b3ba7

Browse files
committed
cleanup
1 parent f3415c9 commit 49b3ba7

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ COPY lib/src ./src
99
COPY lib/build.gradle ./
1010

1111
# Build test runner
12-
RUN echo "no-cache"
1312
RUN gradle -i clean build
1413
RUN gradle -i shadowJar \
1514
&& cp build/libs/autotest-runner.jar .
@@ -34,6 +33,6 @@ COPY --from=build /home/builder/autotest-runner.jar ./
3433
COPY --from=cache /root/.m2 /root/.m2
3534

3635
# Copy Maven pom.xml
37-
COPY --from=cache /opt/exercise/pom.xml /home/pom.xml
36+
COPY --from=cache /opt/exercise/pom.xml /root/pom.xml
3837

3938
ENTRYPOINT ["sh", "/opt/test-runner/bin/run.sh"]

bin/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cp -R $input_folder/* .
2222

2323
find . -mindepth 1 -type f | grep 'Test.java' | xargs -I file sed -i "s/@Ignore(.*)//g;s/@Ignore//g;" file
2424

25-
cp /home/pom.xml .
25+
cp /root/pom.xml .
2626

2727
java -jar /opt/test-runner/autotest-runner.jar $problem_slug
2828
mv results.json $output_folder

lib/src/main/java/com/exercism/runner/TestRunner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ private static void run(String slug) throws InterruptedException, IOException {
4141
String mavenOutput = Files.asCharSource(
4242
Paths.get(MAVEN_TEST_OUTPUT).toFile(), StandardCharsets.UTF_8)
4343
.read();
44-
if (mavenOutput.contains("ERROR")) {
44+
if (mavenOutput.contains("COMPILATION ERROR")) {
4545
ReportGenerator.report(
4646
Report.builder()
4747
.setStatus("error")

run_in_docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OutputDirectory="$3"
1313

1414
docker build -t exercism/java-test-runner .
1515

16-
time docker run \
16+
docker run \
1717
--network none \
1818
--mount type=bind,src="${InputDirectory}",dst=/solution \
1919
--mount type=bind,src="${OutputDirectory}",dst=/results \

0 commit comments

Comments
 (0)