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: ...@@ -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 # 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. # when running from the command line.
# `installAtEnd` and `deployAtEnd`are only effective with recent version of the corresponding plugins. # `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. # Cache downloaded dependencies and plugins between builds.
# To keep cache across branches add 'key: "$CI_JOB_REF_NAME"' # To keep cache across branches add 'key: "$CI_JOB_REF_NAME"'
...@@ -33,18 +33,18 @@ variables: ...@@ -33,18 +33,18 @@ variables:
.validate: &validate .validate: &validate
stage: build stage: build
script: script:
- env - env
- 'mvn $MAVEN_CLI_OPTS test-compile' - 'mvn $MAVEN_CLI_OPTS test-compile'
# For merge requests do not `deploy` but only run `verify`. # For merge requests do not `deploy` but only run `verify`.
# See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html # See https://maven.apache.org/guides/introduction/introduction-to-the-lifecycle.html
.verify: &verify .verify: &verify
stage: test stage: test
script: script:
- env - env
- 'mvn $MAVEN_CLI_OPTS verify site site:stage' - 'mvn $MAVEN_CLI_OPTS verify site site:stage'
except: except:
- master - master
# Validate merge requests using JDK8 # Validate merge requests using JDK8
validate:jdk8: validate:jdk8:
...@@ -66,14 +66,14 @@ deploy:jdk8: ...@@ -66,14 +66,14 @@ deploy:jdk8:
# Use stage test here, so the pages job may later pickup the created site. # Use stage test here, so the pages job may later pickup the created site.
stage: test stage: test
script: script:
- env - env
- 'mvn $MAVEN_CLI_OPTS deploy site site:stage' - 'mvn $MAVEN_CLI_OPTS deploy site site:stage'
only: only:
- master - master
# Archive up the built documentation site. # Archive up the built documentation site.
artifacts: artifacts:
paths: paths:
- target/staging - target/staging
image: maven:3.3.9-jdk-8 image: maven:3.3.9-jdk-8
...@@ -81,14 +81,14 @@ pages: ...@@ -81,14 +81,14 @@ pages:
image: busybox:latest image: busybox:latest
stage: deploy stage: deploy
script: script:
# Because Maven appends the artifactId automatically to the staging path if you did define a parent pom, # 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. # you might need to use `mv target/staging/YOUR_ARTIFACT_ID public` instead.
- mv target/staging public - mv target/staging public
dependencies: dependencies:
- deploy:jdk8 - deploy:jdk8
artifacts: artifacts:
paths: paths:
- public - public
only: only:
- master - master
pom.xml
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.target>1.8</maven.compiler.target>
<rev>${project.version}</rev>
</properties> </properties>
<distributionManagement> <distributionManagement>
......
src/site/site.xml
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<body> <body>
<breadcrumbs> <breadcrumbs>
<item name="${project.name} (r${project.rev})" href="${project.url}" /> <item name="${project.name} (${project.rev})" href="${project.url}" />
</breadcrumbs> </breadcrumbs>
<menu name="Project Information" ref="reports" inherit="bottom" /> <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!