Skip to content

Jessica Hawkwell / candle-pos

Go to a project
Commit cf5d28ff by Jessica Hawkwell
Options

Fixing a couple items

1 parent 430e688e
Pipeline #100 failed in 0 seconds
Inline Side-by-side
Showing with 20 additions and 19 deletions
.gitlab-ci.yml
......@@ -22,7 +22,7 @@ variables:
# As of Maven 3.3.0 instead of this you may define these options in `.mvn/maven.config` so the same config is used
# when running from the command line.
# `installAtEnd` and `deployAtEnd`are only effective with recent version of the corresponding plugins.
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true"
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -DinstallAtEnd=true -DdeployAtEnd=true -Dproject.rev=`git describe`"
# Cache downloaded dependencies and plugins between builds.
# To keep cache across branches add 'key: "$CI_JOB_REF_NAME"'
......@@ -33,18 +33,18 @@ variables:
.validate: &validate
stage: build
script:
- env
- 'mvn $MAVEN_CLI_OPTS test-compile'
- env
- 'mvn $MAVEN_CLI_OPTS test-compile'
# For merge requests do not `deploy` but only run `verify`.
# See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
.verify: &verify
stage: test
script:
- env
- 'mvn $MAVEN_CLI_OPTS verify site site:stage'
- env
- 'mvn $MAVEN_CLI_OPTS verify site site:stage'
except:
- master
- master
# Validate merge requests using JDK8
validate:jdk8:
......@@ -66,14 +66,14 @@ deploy:jdk8:
# Use stage test here, so the pages job may later pickup the created site.
stage: test
script:
- env
- 'mvn $MAVEN_CLI_OPTS deploy site site:stage'
- env
- 'mvn $MAVEN_CLI_OPTS deploy site site:stage'
only:
- master
- master
# Archive up the built documentation site.
artifacts:
paths:
- target/staging
paths:
- target/staging
image: maven:3.3.9-jdk-8
......@@ -81,14 +81,14 @@ pages:
image: busybox:latest
stage: deploy
script:
# Because Maven appends the artifactId automatically to the staging path if you did define a parent pom,
# you might need to use `mv target/staging/YOUR_ARTIFACT_ID public` instead.
- mv target/staging public
# Because Maven appends the artifactId automatically to the staging path if you did define a parent pom,
# you might need to use `mv target/staging/YOUR_ARTIFACT_ID public` instead.
- mv target/staging public
dependencies:
- deploy:jdk8
- deploy:jdk8
artifacts:
paths:
- public
paths:
- public
only:
- master
- master
pom.xml
......@@ -20,6 +20,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<rev>${project.version}</rev>
</properties>
<distributionManagement>
......
src/site/site.xml
......@@ -30,7 +30,7 @@
<body>
<breadcrumbs>
<item name="${project.name} (r${project.rev})" href="${project.url}" />
<item name="${project.name} (${project.rev})" href="${project.url}" />
</breadcrumbs>
<menu name="Project Information" ref="reports" inherit="bottom" />
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!