Merge branch 'ci-artifact-placing' into 'master'

Fixed ci artifact placement.

See merge request veloren/veloren!567
This commit is contained in:
Acrimon 2019-10-08 12:00:14 +00:00
commit a2651dc692

View File

@ -33,7 +33,7 @@ before_script:
when: manual
artifacts:
paths:
- veloren/artifact
- veloren/artifact/*
expire_in: 1 week
optional-debug:linux:
@ -73,7 +73,7 @@ optional-debug:windows:
when: manual
artifacts:
paths:
- veloren/artifact
- veloren/artifact/*
expire_in: 1 week
optional-release:linux:
@ -177,7 +177,7 @@ linux:
- /^master$/
artifacts:
paths:
- veloren/artifact
- veloren/artifact/*
tags:
- veloren-docker
script:
@ -203,7 +203,7 @@ windows:
- /^master$/
artifacts:
paths:
- veloren/artifact
- veloren/artifact/*
tags:
- veloren-docker
script: