Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f295fd3d by Tony Chemit at 2024-12-11T19:38:35+01:00 update generated validation files - See #2949 - - - - - 67452ae2 by Tony Chemit at 2024-12-12T18:09:34+01:00 Fix Pmd plugin version - - - - - 47f90d0f by Tony Chemit at 2024-12-12T18:10:43+01:00 Make site publish ok with gitlab CI - - - - - 4 changed files: - .gitlab-ci.yml - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesComposition/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesComposition/validation-update.json - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -10,13 +10,18 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat variables: MAVEN_CLI_OPTS: "--batch-mode" BUILD_DIR: "/builds/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}" - CACHE_DIR: "${BUILD_DIR}/.mvn/repository" - MAVEN_OPTS: "-Dmaven.repo.local=${CACHE_DIR} -Xmx2048m" + MVN_CACHE_DIR: "${BUILD_DIR}/.mvn" + REPOSITORY_CACHE_DIR: "${MVN_CACHE_DIR}/repository" + GITLAB_CACHE_DIR: "${MVN_CACHE_DIR}/gitlab-cache" + SITE_CACHE_DIR: "${MVN_CACHE_DIR}/site-cache" + MAVEN_OPTS: "-Dmaven.repo.local=${REPOSITORY_CACHE_DIR} -Xmx2048m -Dscmpublish.checkoutDirectory=${SITE_CACHE_DIR} -Dgitlab.cachePath=${GITLAB_CACHE_DIR}" cache: key: MAVEN_CACHE paths: - - ${CACHE_DIR} + - ${REPOSITORY_CACHE_DIR} + - ${GITLAB_CACHE_DIR} + - ${SITE_CACHE_DIR} - "${BUILD_DIR}/observe/target/*.zip" - "${BUILD_DIR}/observe/target/*.war" @@ -53,7 +58,9 @@ cache: environment: name: site script: - - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-generate-only; fi + - if [[ -n "${PUBLISH_SITE}" && ! -d "${SITE_CACHE_DIR}" ]]; then ( git clone ${CI_REPOSITORY_URL} ${SITE_CACHE_DIR} ; cd ${SITE_CACHE_DIR} ; git checkout pages ); fi + - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-generate-inline; fi + - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-git-init; fi - if [ -n "${PUBLISH_SITE}" ]; then bash .mvn/scripts/publish-site.sh; fi .make-release: &make-release @@ -70,8 +77,8 @@ cache: ################################################################################################### .triggers: &triggers - only: - - triggers + rules: + - if: $CI_PIPELINE_SOURCE == 'trigger' trigger-create-docker: <<: *stage_docker @@ -93,11 +100,9 @@ trigger-make-release: ################################################################################################### .automatic: &automatic - only: - - /^develop.*$/i - - /^feature/.+$/i - except: - - triggers + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/ + - if: $CI_PIPELINE_SOURCE != 'trigger' build: <<: *stage_build @@ -116,15 +121,8 @@ build-for-release: ################################################################################################### .automatic-release: &automatic-release - only: - - tags - -release-create-docker: - <<: *stage_docker - <<: *automatic-release - <<: *create-docker - before_script: - - export CREATE_DOCKER=true + rules: + - if: $CI_COMMIT_TAG release-publish-site: <<: *stage_build @@ -138,10 +136,9 @@ release-publish-site: ################################################################################################### .manual: &manual - only: - - /^develop.*$/i - - /^features/.+$/i - when: manual + rules: + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feature/ + when: manual create-docker: <<: *stage_docker ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesComposition/validation-create.json ===================================== @@ -6,7 +6,7 @@ }, "length": { "errors": [ - "Nautical Length bound (unit m) 0.0 <= length <= 100.0", + "Nautical Length bound (unit m) 0.0 <= length <= 125.0", "length is a positive number", "length is mandatory" ] ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/FloatlinesComposition/validation-update.json ===================================== @@ -6,7 +6,7 @@ }, "length": { "errors": [ - "Nautical Length bound (unit m) 0.0 <= length <= 100.0", + "Nautical Length bound (unit m) 0.0 <= length <= 125.0", "length is a positive number", "length is mandatory" ] ===================================== pom.xml ===================================== @@ -151,7 +151,7 @@ <plugin.version.jarSigner>3.1.0</plugin.version.jarSigner> <plugin.version.javadoc>3.10.1</plugin.version.javadoc> <plugin.version.plugins>3.15.0</plugin.version.plugins> - <plugin.version.pmd>3.25.0</plugin.version.pmd> + <plugin.version.pmd>3.26.0</plugin.version.pmd> <plugin.version.release>3.1.1</plugin.version.release> <plugin.version.resources>3.3.1</plugin.version.resources> <plugin.version.scm>3.3.0</plugin.version.scm> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a7c86a07d2f2238a844322391... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a7c86a07d2f2238a844322391... You're receiving this email because of your account on gitlab.com.