From 24a0c882398e200caca9acf89d46288c36c0974f Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Fri, 5 Jul 2024 17:14:24 +0200 Subject: [PATCH 01/26] Corriger la gestion des dossiers target en cache. fixes #91 --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9e817e..0bb5f9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,10 @@ stages: cache: paths: - .m2/repository + +cache: + key: $CI_COMMIT_REF_SLUG + paths: - target - "*/target" -- GitLab From 0284f2b891a57bac1030d97a13f657b94b8b805c Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Fri, 5 Jul 2024 17:15:06 +0200 Subject: [PATCH 02/26] Corriger la gestion des dossiers target en cache. fixes #91 --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0bb5f9c..baf576a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,8 @@ cache: - .m2/repository cache: - key: $CI_COMMIT_REF_SLUG + # keep cache across branch + key: "$CI_BUILD_REF_NAME" paths: - target - "*/target" -- GitLab From 5aed48a83429898e4d372a308257749d56e4a71a Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Mon, 8 Jul 2024 08:26:28 +0200 Subject: [PATCH 03/26] =?UTF-8?q?Sp=C3=A9cifier=20une=20clef?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index baf576a..3a10334 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,7 @@ stages: - deploy cache: + key: maven-repository paths: - .m2/repository -- GitLab From 1e7b1d4543900605b7eb5e02a368541302b8ce6b Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Mon, 8 Jul 2024 08:44:13 +0200 Subject: [PATCH 04/26] =?UTF-8?q?Ne=20pas=20ex=C3=A9cuter=20l'analyse=20st?= =?UTF-8?q?atique=20dans=20install?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a10334..bc0fe73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,7 +61,7 @@ install_job: needs: ["test_job"] script: - echo "Maven packaging started" - - mvn install -DskipTests + - mvn install -Dcheckstyle.skip=true -Dcpd.skip=true -Dpmd.skip=true -DskipTests artifacts: expire_in: 1 week when: always -- GitLab From 872f08d68e5fa66453b93b4496948187ab4db8e0 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Fri, 5 Jul 2024 17:14:24 +0200 Subject: [PATCH 05/26] Corriger la gestion des dossiers target en cache. fixes #91 --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9e817e..0bb5f9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,6 +14,10 @@ stages: cache: paths: - .m2/repository + +cache: + key: $CI_COMMIT_REF_SLUG + paths: - target - "*/target" -- GitLab From 9c134feb70e38e75c74e4b58193d975161ae572b Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Fri, 5 Jul 2024 17:15:06 +0200 Subject: [PATCH 06/26] Corriger la gestion des dossiers target en cache. fixes #91 --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0bb5f9c..baf576a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,8 @@ cache: - .m2/repository cache: - key: $CI_COMMIT_REF_SLUG + # keep cache across branch + key: "$CI_BUILD_REF_NAME" paths: - target - "*/target" -- GitLab From 3e817644296913b0dcb9e8d1c0f8bad64b92d983 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Mon, 8 Jul 2024 08:26:28 +0200 Subject: [PATCH 07/26] =?UTF-8?q?Sp=C3=A9cifier=20une=20clef?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index baf576a..3a10334 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,7 @@ stages: - deploy cache: + key: maven-repository paths: - .m2/repository -- GitLab From 336d036bf091a1f9f538f0eafec5d1d7f39e022e Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Mon, 8 Jul 2024 08:44:13 +0200 Subject: [PATCH 08/26] =?UTF-8?q?Ne=20pas=20ex=C3=A9cuter=20l'analyse=20st?= =?UTF-8?q?atique=20dans=20install?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3a10334..bc0fe73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,7 +61,7 @@ install_job: needs: ["test_job"] script: - echo "Maven packaging started" - - mvn install -DskipTests + - mvn install -Dcheckstyle.skip=true -Dcpd.skip=true -Dpmd.skip=true -DskipTests artifacts: expire_in: 1 week when: always -- GitLab From a7d0e01405141d4c8ee72f6aca1babb84bc64d14 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 15:08:53 +0200 Subject: [PATCH 09/26] =?UTF-8?q?Utiliser=20GitLab=20Runner=20de=20l'unit?= =?UTF-8?q?=C3=A9.=20refs=20#91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc0fe73..26b9bf8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,10 @@ variables: # To use the registry, DOCKER_AUTH_CONFIG must be set image: registry.forgemia.inra.fr/agroclim/common/docker-projets-java:latest +default: + tags: + - agroclim + stages: - build - test -- GitLab From 880d1f44a0b29162ed86958a617b775a86902b10 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 15:36:14 +0200 Subject: [PATCH 10/26] .m2/settings.xml (archiva) --- .gitlab-ci.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26b9bf8..1390757 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,10 @@ variables: # To use the registry, DOCKER_AUTH_CONFIG must be set image: registry.forgemia.inra.fr/agroclim/common/docker-projets-java:latest +.settingsxml: + before_script: + - echo $M2_SETTINGS_XML > $CI_PROJECT_DIR/.m2/settings.xml + default: tags: - agroclim @@ -29,10 +33,10 @@ cache: build_job: stage: build + extends: .settingsxml script: - echo "Maven compile started" - mvn clean compile test-compile - - ls -lha /usr/bin/tokei - /usr/bin/tokei --version artifacts: expire_in: 1 week @@ -43,6 +47,7 @@ build_job: test_job: stage: test + extends: .settingsxml needs: ["build_job"] script: - echo "Maven test started" @@ -62,6 +67,7 @@ test_job: install_job: stage: install + extends: .settingsxml needs: ["test_job"] script: - echo "Maven packaging started" @@ -74,18 +80,21 @@ install_job: checkstyle_job: stage: code-check + extends: .settingsxml needs: ["install_job"] script: - mvn checkstyle:checkstyle pmd_job: stage: code-check + extends: .settingsxml needs: ["install_job"] script: - mvn pmd:pmd cpd_job: stage: code-check + extends: .settingsxml needs: ["install_job"] script: - mvn pmd:cpd @@ -107,6 +116,7 @@ cobertura_job: # https://agroclim.pages.mia.inra.fr/agrometinfo/www/ pages: stage: deploy + extends: .settingsxml needs: ["checkstyle_job", "pmd_job", "cpd_job"] script: - mvn site -DskipTests -- GitLab From a2d696e30c76b0c3309b5dec9bcfaf215ca18076 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 15:37:53 +0200 Subject: [PATCH 11/26] .m2/settings.xml (archiva) --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1390757..b90e0a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,6 +6,7 @@ image: registry.forgemia.inra.fr/agroclim/common/docker-projets-java:latest .settingsxml: before_script: + - mkdir -p $CI_PROJECT_DIR/.m2/ - echo $M2_SETTINGS_XML > $CI_PROJECT_DIR/.m2/settings.xml default: -- GitLab From f392ae7f95792c3f1c250a1bbc1f7f2bca069721 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 15:40:40 +0200 Subject: [PATCH 12/26] .m2/settings.xml (archiva) --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b90e0a0..d2ca6e6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,12 @@ variables: - MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository" + MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -s $CI_PROJECT_DIR/ci_settings.xml" # To use the registry, DOCKER_AUTH_CONFIG must be set image: registry.forgemia.inra.fr/agroclim/common/docker-projets-java:latest .settingsxml: before_script: - - mkdir -p $CI_PROJECT_DIR/.m2/ - - echo $M2_SETTINGS_XML > $CI_PROJECT_DIR/.m2/settings.xml + - echo "$M2_SETTINGS_XML" > $CI_PROJECT_DIR/ci_settings.xml default: tags: -- GitLab From 91ca46e47ba4bd962a7d46ac34c53cddadf79b0d Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 15:43:16 +0200 Subject: [PATCH 13/26] .m2/settings.xml (archiva) --- .gitlab-ci.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2ca6e6..7d968c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ variables: - MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository -s $CI_PROJECT_DIR/ci_settings.xml" + MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository" + MAVEN_CLI_OPTS: "-s $CI_PROJECT_DIR/ci_settings.xml" # To use the registry, DOCKER_AUTH_CONFIG must be set image: registry.forgemia.inra.fr/agroclim/common/docker-projets-java:latest @@ -36,7 +37,7 @@ build_job: extends: .settingsxml script: - echo "Maven compile started" - - mvn clean compile test-compile + - mvn $MAVEN_CLI_OPTS clean compile test-compile - /usr/bin/tokei --version artifacts: expire_in: 1 week @@ -51,7 +52,7 @@ test_job: needs: ["build_job"] script: - echo "Maven test started" - - mvn test org.jacoco:jacoco-maven-plugin:report-aggregate + - mvn $MAVEN_CLI_OPTS test org.jacoco:jacoco-maven-plugin:report-aggregate artifacts: expire_in: 1 week when: always @@ -71,7 +72,7 @@ install_job: needs: ["test_job"] script: - echo "Maven packaging started" - - mvn install -Dcheckstyle.skip=true -Dcpd.skip=true -Dpmd.skip=true -DskipTests + - mvn $MAVEN_CLI_OPTS install -Dcheckstyle.skip=true -Dcpd.skip=true -Dpmd.skip=true -DskipTests artifacts: expire_in: 1 week when: always @@ -83,21 +84,21 @@ checkstyle_job: extends: .settingsxml needs: ["install_job"] script: - - mvn checkstyle:checkstyle + - mvn $MAVEN_CLI_OPTS checkstyle:checkstyle pmd_job: stage: code-check extends: .settingsxml needs: ["install_job"] script: - - mvn pmd:pmd + - mvn $MAVEN_CLI_OPTS pmd:pmd cpd_job: stage: code-check extends: .settingsxml needs: ["install_job"] script: - - mvn pmd:cpd + - mvn $MAVEN_CLI_OPTS pmd:cpd cobertura_job: stage: deploy @@ -119,7 +120,7 @@ pages: extends: .settingsxml needs: ["checkstyle_job", "pmd_job", "cpd_job"] script: - - mvn site -DskipTests + - mvn $MAVEN_CLI_OPTS site -DskipTests - rm -fr target/site/www-client target/site/www-server target/site/www-shared - mv www-client/target/site/ target/site/www-client - mv www-server/target/site/ target/site/www-server -- GitLab From fcf1dec7693a06ea82c0620a29df472a8c546fd5 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 15:51:34 +0200 Subject: [PATCH 14/26] test cache/key --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d968c7..0c66e5a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,10 +20,10 @@ stages: - code-check - deploy +# Cache downloaded dependencies and plugins between builds. cache: - key: maven-repository paths: - - .m2/repository + - $CI_PROJECT_DIR/.m2/repository cache: # keep cache across branch -- GitLab From a21ecf2a6fae594d76034ab8ede98d869d745635 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 16:11:55 +0200 Subject: [PATCH 15/26] Download dependencies first --- .gitlab-ci.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c66e5a..8427742 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository" - MAVEN_CLI_OPTS: "-s $CI_PROJECT_DIR/ci_settings.xml" + MAVEN_CLI_OPTS: "-s $CI_PROJECT_DIR/ci_settings.xml --offline" # To use the registry, DOCKER_AUTH_CONFIG must be set image: registry.forgemia.inra.fr/agroclim/common/docker-projets-java:latest @@ -32,9 +32,17 @@ cache: - target - "*/target" +dependencies_job: + stage: build + extends: .settingsxml + script: + - echo "Download all dependencies" + - mvn -s $CI_PROJECT_DIR/ci_settings.xml dependency:resolve dependency:resolve-plugins + build_job: stage: build extends: .settingsxml + needs: ["dependencies_job"] script: - echo "Maven compile started" - mvn $MAVEN_CLI_OPTS clean compile test-compile -- GitLab From 75351f02b3a7cb1b13f7ad6b8929e301cb6e48c0 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 16:17:53 +0200 Subject: [PATCH 16/26] Download dependencies first --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8427742..3b6f5f4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,8 +36,8 @@ dependencies_job: stage: build extends: .settingsxml script: - - echo "Download all dependencies" - - mvn -s $CI_PROJECT_DIR/ci_settings.xml dependency:resolve dependency:resolve-plugins + - echo "Download all dependencies (dependencies, plugins, reports)" + - mvn -s $CI_PROJECT_DIR/ci_settings.xml dependency:go-offline build_job: stage: build -- GitLab From 9eb839e02772473d5374b4aa45551e509b2af40b Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 16:21:49 +0200 Subject: [PATCH 17/26] Download dependencies first --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b6f5f4..678ae3f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,7 +37,7 @@ dependencies_job: extends: .settingsxml script: - echo "Download all dependencies (dependencies, plugins, reports)" - - mvn -s $CI_PROJECT_DIR/ci_settings.xml dependency:go-offline + - mvn -s $CI_PROJECT_DIR/ci_settings.xml dependency:go-offline --projects=.,www-client,www-server,www-shared build_job: stage: build -- GitLab From 819bf8045559162ba2dd6d83966f01b69c569a10 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 16:27:10 +0200 Subject: [PATCH 18/26] Test find --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 678ae3f..183d01b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ image: registry.forgemia.inra.fr/agroclim/common/docker-projets-java:latest .settingsxml: before_script: - echo "$M2_SETTINGS_XML" > $CI_PROJECT_DIR/ci_settings.xml + - find $CI_PROJECT_DIR/.m2/repository/net/ltgt/gwt/maven/gwt-maven-plugin/ default: tags: -- GitLab From 0c937fd5cac3ea92f1670ec01736da1ee90df3b7 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 16:30:33 +0200 Subject: [PATCH 19/26] Test find --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 183d01b..12aada1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ image: registry.forgemia.inra.fr/agroclim/common/docker-projets-java:latest .settingsxml: before_script: - echo "$M2_SETTINGS_XML" > $CI_PROJECT_DIR/ci_settings.xml - - find $CI_PROJECT_DIR/.m2/repository/net/ltgt/gwt/maven/gwt-maven-plugin/ + - find $CI_PROJECT_DIR/.m2/repository/ -type d default: tags: -- GitLab From 81add78a6675a8d6acbd86c2046f1fb45b66abd9 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 16:31:51 +0200 Subject: [PATCH 20/26] Test find --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 12aada1..0edb8c8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ image: registry.forgemia.inra.fr/agroclim/common/docker-projets-java:latest .settingsxml: before_script: - echo "$M2_SETTINGS_XML" > $CI_PROJECT_DIR/ci_settings.xml - - find $CI_PROJECT_DIR/.m2/repository/ -type d + - find $CI_PROJECT_DIR/.m2/repository/ -type d 2> /dev/null default: tags: -- GitLab From 101f2a93021a3870c45a6da2153bb3dac0d143eb Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 16:39:11 +0200 Subject: [PATCH 21/26] Test find --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0edb8c8..6618278 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,7 +8,7 @@ image: registry.forgemia.inra.fr/agroclim/common/docker-projets-java:latest .settingsxml: before_script: - echo "$M2_SETTINGS_XML" > $CI_PROJECT_DIR/ci_settings.xml - - find $CI_PROJECT_DIR/.m2/repository/ -type d 2> /dev/null + - find $CI_PROJECT_DIR/.m2/repository/ -type d || echo "pas trouvé !" default: tags: -- GitLab From 6a750c6c2fc27a614d203698d09f231f473ca4a3 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 17:24:55 +0200 Subject: [PATCH 22/26] =?UTF-8?q?R=C3=A9organisation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 37 +++++++++++++++++-------------------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6618278..cdf5af9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,18 +1,22 @@ -variables: - MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository" - MAVEN_CLI_OPTS: "-s $CI_PROJECT_DIR/ci_settings.xml --offline" - # To use the registry, DOCKER_AUTH_CONFIG must be set image: registry.forgemia.inra.fr/agroclim/common/docker-projets-java:latest -.settingsxml: - before_script: - - echo "$M2_SETTINGS_XML" > $CI_PROJECT_DIR/ci_settings.xml - - find $CI_PROJECT_DIR/.m2/repository/ -type d || echo "pas trouvé !" - default: + # Cache downloaded dependencies and plugins between builds. + cache: + paths: + - $CI_PROJECT_DIR/.m2/repository + # keep cache across branch + cache: + key: "$CI_BUILD_REF_NAME" + paths: + - target + - "*/target" tags: - agroclim + variables: + MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository" + MAVEN_CLI_OPTS: "-s $CI_PROJECT_DIR/ci_settings.xml" stages: - build @@ -21,17 +25,10 @@ stages: - code-check - deploy -# Cache downloaded dependencies and plugins between builds. -cache: - paths: - - $CI_PROJECT_DIR/.m2/repository - -cache: - # keep cache across branch - key: "$CI_BUILD_REF_NAME" - paths: - - target - - "*/target" +.settingsxml: + before_script: + - echo "Maven settings.xml" + - echo "$M2_SETTINGS_XML" > $CI_PROJECT_DIR/ci_settings.xml dependencies_job: stage: build -- GitLab From 7c0bdfc1284d809fabb8eaffd04e217c33817f18 Mon Sep 17 00:00:00 2001 From: Olivier Maury <olivier.maury@inrae.fr> Date: Tue, 6 Aug 2024 17:32:09 +0200 Subject: [PATCH 23/26] Correction .gitlab-ci.yml --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cdf5af9..3604323 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,10 @@ # To use the registry, DOCKER_AUTH_CONFIG must be set image: registry.forgemia.inra.fr/agroclim/common/docker-projets-java:latest +variables: + MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository" + MAVEN_CLI_OPTS: "-s $CI_PROJECT_DIR/ci_settings.xml" + default: # Cache downloaded dependencies and plugins between builds. cache: @@ -14,9 +18,6 @@ default: - "*/target" tags: - agroclim - variables: - MAVEN_OPTS: "-Dmaven.repo.local=$CI_PROJECT_DIR/.m2/repository" - MAVEN_CLI_OPTS: "-s $CI_PROJECT_DIR/ci_settings.xml" stages: - build -- GitLab From df30b998e364b5860991b5e86a1de2c8224c86a5 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 17:55:29 +0200 Subject: [PATCH 24/26] =?UTF-8?q?D=C3=A9placer=20.settingsxml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3604323..5a02e11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,11 @@ default: tags: - agroclim +.settingsxml: + before_script: + - echo "Maven settings.xml" + - echo "$M2_SETTINGS_XML" > $CI_PROJECT_DIR/ci_settings.xml + stages: - build - test @@ -26,11 +31,6 @@ stages: - code-check - deploy -.settingsxml: - before_script: - - echo "Maven settings.xml" - - echo "$M2_SETTINGS_XML" > $CI_PROJECT_DIR/ci_settings.xml - dependencies_job: stage: build extends: .settingsxml -- GitLab From 6f7c36f45da64f636f949b3a143f60197c0d91a7 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 17:57:39 +0200 Subject: [PATCH 25/26] =?UTF-8?q?Revert=20"D=C3=A9placer=20.settingsxml"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit df30b998e364b5860991b5e86a1de2c8224c86a5. --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a02e11..3604323 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,11 +19,6 @@ default: tags: - agroclim -.settingsxml: - before_script: - - echo "Maven settings.xml" - - echo "$M2_SETTINGS_XML" > $CI_PROJECT_DIR/ci_settings.xml - stages: - build - test @@ -31,6 +26,11 @@ stages: - code-check - deploy +.settingsxml: + before_script: + - echo "Maven settings.xml" + - echo "$M2_SETTINGS_XML" > $CI_PROJECT_DIR/ci_settings.xml + dependencies_job: stage: build extends: .settingsxml -- GitLab From 8ff39164b717cbd2ccadcd0d464bf30767bbbbf2 Mon Sep 17 00:00:00 2001 From: Olivier Maury <Olivier.Maury@inrae.fr> Date: Tue, 6 Aug 2024 18:12:42 +0200 Subject: [PATCH 26/26] cache / artefacts --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3604323..d6ec9dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,14 +8,9 @@ variables: default: # Cache downloaded dependencies and plugins between builds. cache: + key: maven-repository paths: - $CI_PROJECT_DIR/.m2/repository - # keep cache across branch - cache: - key: "$CI_BUILD_REF_NAME" - paths: - - target - - "*/target" tags: - agroclim @@ -85,6 +80,8 @@ install_job: when: always paths: - .m2/repository + - target + - "*/target" checkstyle_job: stage: code-check @@ -133,6 +130,9 @@ pages: - mv www-server/target/site/ target/site/www-server - mv www-shared/target/site/ target/site/www-shared artifacts: + expire_in: 1 week + when: always paths: - - target/site + - target + - "*/target" publish: target/site -- GitLab