From 7cf329c9761917de51a4dbb90a5fc6390e6570a9 Mon Sep 17 00:00:00 2001 From: LACROIX Nicolas Date: Fri, 4 Oct 2019 11:07:09 +0200 Subject: [PATCH 1/5] Modification de l'encodage vers UTF-8 --- NGCC/src/config/QuestionBoite.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NGCC/src/config/QuestionBoite.java b/NGCC/src/config/QuestionBoite.java index 2ec1b8e..9c4e198 100644 --- a/NGCC/src/config/QuestionBoite.java +++ b/NGCC/src/config/QuestionBoite.java @@ -1,7 +1,7 @@ package config; public class QuestionBoite extends Question { -// Type de question differente du normal, c'est une question avec une boite de texte où l'étudiant saisira du texte +// Type de question differente du normal, c'est une question avec une boite de texte où l'étudiant saisira du texte private int nbligne; // nb de lignes dans la boite public QuestionBoite(String t, boolean b, int nb) { From 4336052a3dac0878883eb3cf531bff6e046e523a Mon Sep 17 00:00:00 2001 From: ln803631 Date: Fri, 4 Oct 2019 11:14:04 +0200 Subject: [PATCH 2/5] Modification pour prendre en compte la compilation des .jar --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 15c6829..640ebca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,7 @@ compileAndTests : - javac -cp LIB/junit-platform-console-standalone-1.5.1.jar:bin:. -d bin NGCC/tests/*/*.java script: - java -jar LIB/junit-platform-console-standalone-1.5.1.jar --class-path bin --scan-class-path + - java -jar NGCC/jar/* #allow_failure: true From 9512cbf735cea75fcac6c5be72944f949b8d6402 Mon Sep 17 00:00:00 2001 From: ln803631 Date: Fri, 4 Oct 2019 11:38:13 +0200 Subject: [PATCH 3/5] Modification du fichier .gitlab-ci.yml pour prendre en compte les .jar externes --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 640ebca..5fa1ed1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,11 +9,11 @@ compileAndTests : - ls -la - mkdir bin - javac -cp LIB/junit-platform-console-standalone-1.5.1.jar:bin:. -d bin NGCC/src/*/*.java + - javac -cp LIB/junit-platform-console-standalone-1.5.1.jar:bin:. -d bin NGCC/jar/* - ls bin - javac -cp LIB/junit-platform-console-standalone-1.5.1.jar:bin:. -d bin NGCC/tests/*/*.java script: - java -jar LIB/junit-platform-console-standalone-1.5.1.jar --class-path bin --scan-class-path - - java -jar NGCC/jar/* #allow_failure: true From bf4041e28da575877aba38eb7f0e5ccf9c59d13f Mon Sep 17 00:00:00 2001 From: ln803631 Date: Fri, 4 Oct 2019 11:39:58 +0200 Subject: [PATCH 4/5] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5fa1ed1..1171247 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,8 +8,8 @@ compileAndTests : before_script: - ls -la - mkdir bin + - javac -cp LIB/junit-platform-console-standalone-1.5.1.jar:bin:. -d bin NGCC/jar/* # compile and add external jar to classpath - javac -cp LIB/junit-platform-console-standalone-1.5.1.jar:bin:. -d bin NGCC/src/*/*.java - - javac -cp LIB/junit-platform-console-standalone-1.5.1.jar:bin:. -d bin NGCC/jar/* - ls bin - javac -cp LIB/junit-platform-console-standalone-1.5.1.jar:bin:. -d bin NGCC/tests/*/*.java script: From 6770b2505ccbb8b3cfd9b18c6704fef2fe94cac9 Mon Sep 17 00:00:00 2001 From: ln803631 Date: Fri, 4 Oct 2019 12:03:52 +0200 Subject: [PATCH 5/5] Update .gitlab-ci.yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1171247..0cb8348 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ compileAndTests : before_script: - ls -la - mkdir bin - - javac -cp LIB/junit-platform-console-standalone-1.5.1.jar:bin:. -d bin NGCC/jar/* # compile and add external jar to classpath + - java -cp LIB/junit-platform-console-standalone-1.5.1.jar:bin:. -d bin NGCC/jar/* # compile and add external jar to classpath - javac -cp LIB/junit-platform-console-standalone-1.5.1.jar:bin:. -d bin NGCC/src/*/*.java - ls bin - javac -cp LIB/junit-platform-console-standalone-1.5.1.jar:bin:. -d bin NGCC/tests/*/*.java