Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Simonstrator
API
Commits
e67cede5
Commit
e67cede5
authored
May 14, 2018
by
Tobias Meuser
Browse files
Merge branch 'master' into tm/vehicular-services
parents
be60ca55
29e31f24
Changes
1
Show whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
e67cede5
...
@@ -19,6 +19,8 @@ validate:
...
@@ -19,6 +19,8 @@ validate:
stage
:
build
stage
:
build
script
:
script
:
-
'
mvn
$MAVEN_CLI_OPTS
test-compile'
-
'
mvn
$MAVEN_CLI_OPTS
test-compile'
only
:
-
master
image
:
maven:3.3.9-jdk-8
image
:
maven:3.3.9-jdk-8
# For merge requests do not `deploy` but only run `verify`.
# For merge requests do not `deploy` but only run `verify`.
...
@@ -27,19 +29,9 @@ verify:
...
@@ -27,19 +29,9 @@ verify:
stage
:
test
stage
:
test
script
:
script
:
-
'
mvn
$MAVEN_CLI_OPTS
verify'
-
'
mvn
$MAVEN_CLI_OPTS
verify'
except
:
-
master
image
:
maven:3.3.9-jdk-8
# For `master` branch run `mvn deploy` automatically.
# Here you need to decide whether you want to use JDK7 or 8.
deploy
:
stage
:
deploy
script
:
-
'
mvn
$MAVEN_CLI_OPTS
deploy'
only
:
only
:
-
master
-
master
image
:
maven:3.3.9-jdk-8
image
:
maven:3.3.9-jdk-8
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment