From dcd9a0d860e4b9d69d0e92fe3718b037253484bc Mon Sep 17 00:00:00 2001
From: Guillaume Martres <smarter@ubuntu.com>
Date: Thu, 19 Sep 2019 20:39:10 +0200
Subject: [PATCH 1/2] Fix runGradingTest on windows

Fix for
https://gitlab.epfl.ch/lamp/cs-210-functional-programming-2019/issues/9,
classpath are separated by ";" instead of ":" on Windows (because ":" is
needed to write "C:\..."), the solution is to use `File.pathSeparator`
which will choose the correct character for the current OS.
---
 project/StudentTasks.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/StudentTasks.scala b/project/StudentTasks.scala
index bec5cec..587ba85 100644
--- a/project/StudentTasks.scala
+++ b/project/StudentTasks.scala
@@ -53,7 +53,7 @@ object StudentTasks extends AutoPlugin {
       throw new MessageOnlyException(s"Could not find tests JarFile: $testSuiteJar")
     }
 
-    val classPath = s"${(Test / dependencyClasspath).value.map(_.data).mkString(":")}:$testSuiteJar"
+    val classPath = s"${(Test / dependencyClasspath).value.map(_.data).mkString(File.pathSeparator)}${File.pathSeparator}$testSuiteJar"
     val junitProcess =
       Fork.java.fork(
         ForkOptions(),

From 14e488b676c8e34f886335c5b5a9776be876b4a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
Date: Tue, 24 Sep 2019 08:02:50 +0200
Subject: [PATCH 2/2] Stop submitting grading JSON back to gitlab

---
 .gitlab-ci.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a2c7174..f62736b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,9 +30,4 @@ grade:
     - cp submission.jar /shared/submission/submission.jar
   script:
     - cd /grader
-    - /grader/grade > result.json
-    - cat result.json | /grader/feedback-printer
-  artifacts:
-    expire_in: 7 days
-    paths:
-      - /grader/result.json
+    - /grader/grade | /grader/feedback-printer