From 51d03e17e7653228bc2f475d6e7fd4100942c34c Mon Sep 17 00:00:00 2001
From: TO
Date: Sun, 5 Mar 2023 02:00:57 +0100
Subject: [PATCH 1/4] super
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 8f06169..6164420 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
# client-serveur
+test2
\ No newline at end of file
From 3331d654ad043a5d40095c1dc9441c5e4a50269d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophyl=20Hoguet?=
Date: Sun, 5 Mar 2023 02:06:53 +0100
Subject: [PATCH 2/4] ok
---
README.md | 1 +
1 file changed, 1 insertion(+)
diff --git a/README.md b/README.md
index 8f06169..015acde 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,3 @@
# client-serveur
+test3
\ No newline at end of file
From d00051b8467c769de34870871451d622755f5d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophyl=20Hoguet?=
Date: Sun, 5 Mar 2023 02:16:46 +0100
Subject: [PATCH 3/4] working ci
---
.gitlab-ci.yml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab8ff09..9d0ad7e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,10 @@ variables:
MAVEN_CLI_OPTS: "--batch-mode"
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
-cache:
- paths:
- - .m2/repository/
- - frontend/node_modules/
+# cache:
+# paths:
+# - .m2/repository/
+# - frontend/node_modules/
build_job:
stage: build
@@ -15,11 +15,11 @@ build_job:
- mvn $MAVEN_CLI_OPTS compile
artifacts:
expire_in: 10 min
- paths:
+ paths:
- target/
- "*/target"
tags:
- - shell
+ - shell
test_job:
stage: test
@@ -29,7 +29,7 @@ test_job:
- find . -name "*.class" -exec touch {} \+
- mvn $MAVEN_CLI_OPTS test
tags:
- - shell
+ - shell
### cleanup project for security issues
cleanup:
@@ -39,4 +39,4 @@ cleanup:
- cd ; tree -d -L 5
when: always
tags:
- - shell
+ - shell
From b628648b203c0bcf750dbff0412ce371e743e914 Mon Sep 17 00:00:00 2001
From: Theophyl Hoguet
Date: Thu, 9 Mar 2023 11:56:31 +0100
Subject: [PATCH 4/4] Revert "working ci"
This reverts commit d00051b8467c769de34870871451d622755f5d3f
---
.gitlab-ci.yml | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d0ad7e..ab8ff09 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,10 @@ variables:
MAVEN_CLI_OPTS: "--batch-mode"
MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
-# cache:
-# paths:
-# - .m2/repository/
-# - frontend/node_modules/
+cache:
+ paths:
+ - .m2/repository/
+ - frontend/node_modules/
build_job:
stage: build
@@ -15,11 +15,11 @@ build_job:
- mvn $MAVEN_CLI_OPTS compile
artifacts:
expire_in: 10 min
- paths:
+ paths:
- target/
- "*/target"
tags:
- - shell
+ - shell
test_job:
stage: test
@@ -29,7 +29,7 @@ test_job:
- find . -name "*.class" -exec touch {} \+
- mvn $MAVEN_CLI_OPTS test
tags:
- - shell
+ - shell
### cleanup project for security issues
cleanup:
@@ -39,4 +39,4 @@ cleanup:
- cd ; tree -d -L 5
when: always
tags:
- - shell
+ - shell