From 3a3c85de7da87d93ebf712ea4f5ec8a5edacd74b Mon Sep 17 00:00:00 2001 From: as704245 Date: Sat, 26 Oct 2019 11:51:00 +0200 Subject: [PATCH 1/7] test pour voir si dependancy list marche --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a9a5ec..8087da2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,4 +14,6 @@ compileAndTests : script: - java -jar LIB/junit-platform-console-standalone-1.5.1.jar --class-path bin --scan-class-path #allow_failure: true - + + include: + template: Dependency-Scanning.gitlab-ci.yml \ No newline at end of file From 10c90f5992bdc04663ef17f4ae9de10dd18fa7ca Mon Sep 17 00:00:00 2001 From: as704245 Date: Sat, 26 Oct 2019 11:57:37 +0200 Subject: [PATCH 2/7] Update .gitlab-ci.yml --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8087da2..043d54d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,9 @@ image: openjdk:11 variables: GIT_SSL_NO_VERIFY: "1" +include: + template: Dependency-Scanning.gitlab-ci.yml + compileAndTests : # References to libraries should be managed by any other ways (maven, npm, pip, ...) before_script: @@ -13,7 +16,4 @@ compileAndTests : - java -Dfile.encoding=UTF-8 -classpath ./bin:./jar/commons-beanutils-1.9.2.jar:./jar/commons-io-2.6.jar:./jar/commons-logging-1.2-javadoc.jar:./jar/commons-logging-1.2.jar:./jar/fontbox-2.0.16.jar:./jar/fontbox-2.0.9.jar:./jar/ghost4j-1.0.1.jar:./jar/hamcrest-core-1.3.jar:./jar/itext-2.1.7.jar:./jar/jai-imageio-core-1.4.0.jar:./jar/jbig2-imageio-3.0.0.jar:./jar/jboss-vfs-3.2.12.Final.jar:./jar/jcl-over-slf4j-1.7.25.jar:./jar/jna-4.1.0.jar:./jar/jul-to-slf4j-1.7.25.jar:./jar/junit-4.12.jar:./jar/lept4j-1.6.4.jar:./jar/log4j-api-2.12.1.jar:./jar/log4j-core-2.12.1.jar:./jar/log4j-over-slf4j-1.7.25.jar:./jar/logback-classic-1.2.3.jar:./jar/logback-core-1.2.3.jar:./jar/pdfbox-2.0.16.jar:./jar/pdfbox-2.0.9.jar:./jar/pdfbox-app-2.0.16.jar:./jar/pdfbox-debugger-2.0.16.jar:./jar/pdfbox-tools-2.0.16.jar:./jar/pdfbox-tools-2.0.9.jar:./jar/preflight-2.0.16.jar:./jar/preflight-app-2.0.16.jar:./jar/slf4j-api-1.7.25.jar:./jar/tess4j-3.4.8.jar:./jar/xmlgraphics-commons-1.5.jar:./jar/xmpbox-2.0.16.jar:/LIB/junit-platform-console-standalone-1.5.1.jar Exec script: - java -jar LIB/junit-platform-console-standalone-1.5.1.jar --class-path bin --scan-class-path - #allow_failure: true - - include: - template: Dependency-Scanning.gitlab-ci.yml \ No newline at end of file + #allow_failure: true \ No newline at end of file From 20dd6c5801fa246ac6aff02a027eaf02324164ce Mon Sep 17 00:00:00 2001 From: as704245 Date: Sat, 26 Oct 2019 12:10:48 +0200 Subject: [PATCH 3/7] test --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 043d54d..9b5ef39 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: GIT_SSL_NO_VERIFY: "1" include: - template: Dependency-Scanning.gitlab-ci.yml + - template: Dependency-Scanning.gitlab-ci.yml compileAndTests : # References to libraries should be managed by any other ways (maven, npm, pip, ...) From ba548f5633852bbecd7c63ea32514d10d73ceb47 Mon Sep 17 00:00:00 2001 From: as704245 Date: Sat, 26 Oct 2019 12:34:09 +0200 Subject: [PATCH 4/7] test --- gl-dependency-scanning-report.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 gl-dependency-scanning-report.json diff --git a/gl-dependency-scanning-report.json b/gl-dependency-scanning-report.json new file mode 100644 index 0000000..e69de29 From bbbce36aa62df2af2d01c58af4d1c9afbaeadc67 Mon Sep 17 00:00:00 2001 From: as704245 Date: Sat, 26 Oct 2019 12:37:50 +0200 Subject: [PATCH 5/7] docker en privileged mode --- config.toml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 config.toml diff --git a/config.toml b/config.toml new file mode 100644 index 0000000..1254757 --- /dev/null +++ b/config.toml @@ -0,0 +1,4 @@ +[[runners]] + executor = "docker" + [runners.docker] + privileged = true \ No newline at end of file From 2c5d1cb211074456901babde57ac0b27d2239aa1 Mon Sep 17 00:00:00 2001 From: as704245 Date: Sat, 26 Oct 2019 12:40:09 +0200 Subject: [PATCH 6/7] Delete gl-dependency-scanning-report.json --- gl-dependency-scanning-report.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 gl-dependency-scanning-report.json diff --git a/gl-dependency-scanning-report.json b/gl-dependency-scanning-report.json deleted file mode 100644 index e69de29..0000000 From fb52f4de6ac847fe929fab7f83c9bb37d521fe19 Mon Sep 17 00:00:00 2001 From: as704245 Date: Sat, 26 Oct 2019 12:40:12 +0200 Subject: [PATCH 7/7] Delete config.toml --- config.toml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 config.toml diff --git a/config.toml b/config.toml deleted file mode 100644 index 1254757..0000000 --- a/config.toml +++ /dev/null @@ -1,4 +0,0 @@ -[[runners]] - executor = "docker" - [runners.docker] - privileged = true \ No newline at end of file