diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8cd0c26288a4e6286825a56c0a7efb1a552ffd82..4e3b590ec198a34b6ba481c3ea256f2e36da94d3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,11 @@ stages: -- verify -- deploy + - verify + - deploy default: # Default image image: registry.orekit.org/orekit/ci-utils/maven:3.9.6-eclipse-temurin-11 + # Cache downloaded dependencies and plugins between builds. # To keep cache across branches add 'key: "$CI_JOB_REF_NAME"' cache: @@ -21,6 +22,7 @@ variables: MAVEN_CLI_OPTS: "-s .CI/maven-settings.xml --batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true" SONAR_PROJECT_KEY: "${CI_PROJECT_NAMESPACE}:${CI_PROJECT_NAME}" SONAR_PROJECT_NAME: "${CI_PROJECT_TITLE} (${CI_PROJECT_NAMESPACE}:${CI_PROJECT_NAME})" + TARGET_URL_PREFIX: "cochise@ganymede.orekit.org:/var/www/mvn-sites/site-rugged" verify: stage: verify @@ -62,9 +64,9 @@ deploy:artifacts: paths: - target/*.jar only: - - develop@orekit/rugged - - /^release-[.0-9]+$/@orekit/rugged - master@orekit/rugged + - /^release-[.0-9]+$/@orekit/rugged + - develop@orekit/rugged deploy:site: stage: deploy diff --git a/pom.xml b/pom.xml index 0203431194b162eda84b2e412a166d7f955acd32..ae853c590b846680ab2a8fff11b19f1e2f11b8a2 100644 --- a/pom.xml +++ b/pom.xml @@ -46,7 +46,7 @@ <rugged.maven-site-plugin.version>3.12.1</rugged.maven-site-plugin.version> <rugged.maven-source-plugin.version>3.2.1</rugged.maven-source-plugin.version> <rugged.maven-surefire-plugin.version>2.22.2</rugged.maven-surefire-plugin.version> - <rugged.maven-surefire-report-plugin.version>3.0.0-M6</rugged.maven-surefire-report-plugin.version> + <rugged.maven-surefire-report-plugin.version>3.2.1</rugged.maven-surefire-report-plugin.version> <rugged.jgit.buildnumber.version>1.2.12</rugged.jgit.buildnumber.version> <rugged.build-helper-maven-plugin.version>3.3.0</rugged.build-helper-maven-plugin.version> <rugged.nexus-staging-maven-plugin.version>1.6.13</rugged.nexus-staging-maven-plugin.version> @@ -137,14 +137,6 @@ <url>https://gitlab.orekit.org/orekit/rugged/issues</url> </issueManagement> - <distributionManagement> - <site> - <id>website</id> - <name>Rugged Website</name> - <url>scp://cochise@spoutnik.orekit.org/var/www/mvn-sites/site-rugged-${project.version}</url> - </site> - </distributionManagement> - <dependencies> <dependency> <groupId>org.orekit</groupId>