Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 62e30e50 by Tony Chemit at 2021-09-11T19:15:25+02:00 improve how to generate site - - - - - 57c018a6 by Tony Chemit at 2021-09-11T20:43:42+02:00 update pom and toolkit - - - - - 3 changed files: - .gitlab-ci.yml - + .mvn/scripts/publish-site.sh - pom.xml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -44,7 +44,8 @@ cache: environment: name: site script: - - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-publish; fi + - if [ -n "${PUBLISH_SITE}" ]; then ultreiaio-site-generate; fi + - if [ -n "${PUBLISH_SITE}" ]; then bash .mvn/scripts/publish-site.sh; fi .make-release: &make-release environment: ===================================== .mvn/scripts/publish-site.sh ===================================== @@ -0,0 +1,12 @@ +#!/usr/bin/env bash + +source $(which ultreiaio-common) + +declare -l PROJECT +get_project_id PROJECT + +create_log_dir "${PROJECT}" + +execute_maven "-N -Pupdate-site-versions" "Update site versions" "site-update-versions" + +execute_maven "scm-publish:publish-scm" "Publish site" "site-publish" ===================================== pom.xml ===================================== @@ -24,7 +24,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2021.89</version> + <version>2021.90</version> </parent> <groupId>fr.ird.observe</groupId> @@ -161,7 +161,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <lib.version.toolkit>5.0.40-SNAPSHOT</lib.version.toolkit> +<!-- <lib.version.toolkit>5.0.41-SNAPSHOT</lib.version.toolkit>--> <lib.version.ognl>3.1.29</lib.version.ognl> <!--can't use 1.4.197 (date has changed + blob also)--> @@ -220,10 +220,7 @@ <!-- Always deploy asap --> <deployAtEnd>false</deployAtEnd> - <siteMainDirectory>${user.home}/.mvn/site-cache</siteMainDirectory> - <scmpublish.checkoutDirectory>\${siteMainDirectory}/${project.groupId}/${project.artifactId}</scmpublish.checkoutDirectory> <scmpublish.subDirectory>${project.version}</scmpublish.subDirectory> - <scmpublish.tryUpdate>true</scmpublish.tryUpdate> <!-- http plugin configuration --> <http.serviceProviderName>fr.ird.observe.services.ObserveServicesProvider</http.serviceProviderName> @@ -983,5 +980,28 @@ </plugins> </build> </profile> + + <profile> + <id>update-site-versions</id> + <build> + <defaultGoal>pre-site</defaultGoal> + <plugins> + <plugin> + <groupId>fr.ird.observe</groupId> + <artifactId>toolkit-maven-plugin</artifactId> + <version>${lib.version.toolkit}</version> + <executions> + <execution> + <id>default-update-site-versions</id> + <phase>pre-site</phase> + <goals> + <goal>update-site-versions</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bb7abcb5eba4d63f601d77e68... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bb7abcb5eba4d63f601d77e68... You're receiving this email because of your account on gitlab.com.