Skip to content

GitLab

Commit efa36449 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch 'buildwar-fix' into 'master' 

file name depends on the version

See merge request !1244
parents cbd605a0 2c1c4741
Pipeline #31980 failed with stage
in 67 minutes and 48 seconds
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
View file @ efa36449
...@@ -322,7 +322,7 @@ build_war: ...@@ -322,7 +322,7 @@ build_war:
- curl -sL https://deb.nodesource.com/setup_9.x | bash - - curl -sL https://deb.nodesource.com/setup_9.x | bash -
- DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs - DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs
- ant maven-build-with-doc - ant maven-build-with-doc
- cp web/target/web-1.0.war minerva.war - cp web/target/*.war minerva.war
test:dependency_conflict: test:dependency_conflict:
image: maven:3.6.0-jdk-8 image: maven:3.6.0-jdk-8
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment