Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fc26b46d by Tony Chemit at 2024-05-22T11:15:07+02:00 fix CI - - - - - 143767e4 by Tony Chemit at 2024-05-22T11:15:08+02:00 Update changelog for v.9.3.5 [skip CI] - - - - - 2 changed files: - .gitlab-ci.yml - CHANGELOG.md Changes: ===================================== .gitlab-ci.yml ===================================== @@ -9,15 +9,16 @@ image: registry.gitlab.com/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/docker:lat variables: MAVEN_CLI_OPTS: "--batch-mode" - MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository -Xmx2048m" + BUILD_DIR: "/builds/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}" + CACHE_DIR: "${BUILD_DIR}/.mvn/repository" + MAVEN_OPTS: "-Dmaven.repo.local=${CACHE_DIR} -Xmx2048m" cache: + key: MAVEN_CACHE paths: - - .m2/repository/ - - .mvn/ - # il faut utiliser des " et pas de / à la fin... - - "observe/target/*.zip" - - "observe/target/*.war" + - ${CACHE_DIR} + - "${BUILD_DIR}/observe/target/*.zip" + - "${BUILD_DIR}/observe/target/*.war" .stage_docker: &stage_docker stage: Docker @@ -34,7 +35,7 @@ cache: services: - docker:dind script: - - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-11 gitlab-ci-token ${CI_REGISTRY_PASSWORD}; fi + - if [ -n "${CREATE_DOCKER}" ]; then ultreiaio-docker-generate-image-11 gitlab-ci-token ${CI_REGISTRY_PASSWORD} ${BUILD_DIR}; fi .build-for-release: &build-for-release environment: @@ -46,10 +47,10 @@ cache: environment: name: site script: - - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-generate; fi + - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-generate-only; fi - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-update-versions; fi - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-git-init; fi - - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-publish-only; fi + - if [ -n "${PUBLISH_SITE}" ]; then bash .mvn/scripts/publish-site.sh; fi .make-release: &make-release environment: @@ -60,12 +61,6 @@ cache: - if [ -n "${MAKE_RELEASE}" ]; then ultreiaio-release-finish; fi - if [ -n "${MAKE_RELEASE}" ]; then ultreiaio-milestone-create; fi -.deploy-demo: &deploy-demo - environment: - name: demo - script: - - ultreiaio-maven-execute 'clean verify -U -DperformRelease -Dmaven.javadoc.skip -Pdeploy -am -pl server-runner' - ################################################################################################### ### TRIGGERS JOBS ### ################################################################################################### @@ -84,11 +79,6 @@ trigger-build-for-release: <<: *triggers <<: *build-for-release -trigger-deploy-demo: - <<: *stage_test - <<: *triggers - <<: *deploy-demo - trigger-make-release: <<: *stage_release <<: *triggers @@ -98,25 +88,25 @@ trigger-make-release: ### AUTOMATIC JOBS ### ################################################################################################### -#.automatic: &automatic -# only: -# - /^develop.*$/i -# - /^feature/.+$/i -# except: -# - triggers -# -#build: -# <<: *stage_build -# <<: *automatic -# script: -# - ultreiaio-maven-execute 'clean install -U -DskipITs' -# -#build-for-release: -# <<: *stage_test -# <<: *automatic -# <<: *build-for-release -# before_script: -# - export BUILD_FOR_RELEASE=true +.automatic: &automatic + only: + - /^develop.*$/i + - /^feature/.+$/i + except: + - triggers + +build: + <<: *stage_build + <<: *automatic + script: + - ultreiaio-maven-execute 'clean install -e -DperformRelease' + +build-for-release: + <<: *stage_test + <<: *automatic + <<: *build-for-release + before_script: + - export BUILD_FOR_RELEASE=true ################################################################################################### ### AUTOMATIC RELEASE JOBS ### @@ -140,14 +130,6 @@ release-publish-site: before_script: - export PUBLISH_SITE=true -release-deploy-demo: - <<: *stage_build - <<: *automatic-release - environment: - name: demo - script: - - if [ -n "${DEPLOY_DEMO}" ]; then ultreiaio-maven-execute 'clean install -U -DperformRelease -Dmaven.javadoc.skip -am -pl server-runner -Pdeploy'; fi - ################################################################################################### ### MANUAL JOBS ### ################################################################################################### @@ -178,11 +160,3 @@ publish-site: <<: *publish-site before_script: - export PUBLISH_SITE=true - -deploy-demo: - <<: *stage_release - <<: *manual - <<: *deploy-demo - before_script: - - export DEPLOY_DEMO=true - ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,22 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2024-05-13 11:42. + * Last generated at 2024-05-22 10:52. + +## Version [9.3.5](https://gitlab.com/ultreiaio/ird-observe/-/milestones/282) + +**Closed at 2024-05-22.** + +### Download +* [Client (observe-9.3.5-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.3.5/observe-9.3.5-cl...) +* [Serveur (observe-9.3.5.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.3.5/observe-9.3.5.wa...) +* [Serveur (observe-9.3.5-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.3.5/observe-9.3.5-se...) + + +### Issues + * [[Type::Anomalie 2884]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2884) **Le système de conservation du dernier chemin utilisé pour une sauvegarde empêche le logiciel de redémarrer si le volume utilisé n'existe plus** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2885]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2885) **Le répertoire à utiliser pour les sauvegardes n'est pas mis à jour dans la configuration lors d'un sauvegarde pendant un nouvel import** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Anomalie 2886]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2886) **Insertion de set LL logbook sans capture** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.3.4](https://gitlab.com/ultreiaio/ird-observe/-/milestones/280) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f7d0b2e27ee1c38f4ce1cda30... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f7d0b2e27ee1c38f4ce1cda30... You're receiving this email because of your account on gitlab.com.