Merge branch 'master' into 003-add-character-profile
This commit is contained in:
commit
2e3718a409
2 changed files with 5 additions and 4 deletions
|
@ -45,11 +45,12 @@ build:
|
||||||
stage: build
|
stage: build
|
||||||
script:
|
script:
|
||||||
- npm run build
|
- npm run build
|
||||||
|
- mv dist ds4
|
||||||
cache:
|
cache:
|
||||||
<<: *global_cache
|
<<: *global_cache
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- dist
|
- ds4
|
||||||
expire_in: 1 week
|
expire_in: 1 week
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
|
@ -58,7 +59,7 @@ deploy:
|
||||||
dependencies:
|
dependencies:
|
||||||
- build
|
- build
|
||||||
script:
|
script:
|
||||||
- rsync --delete -az ./dist/ rsync://${DEPLOYMENT_USER}@${DEPLOYMENT_SERVER}:${DEPLOYMENT_PATH}
|
- rsync --delete -az ./ds4/ rsync://${DEPLOYMENT_USER}@${DEPLOYMENT_SERVER}:${DEPLOYMENT_PATH}
|
||||||
environment:
|
environment:
|
||||||
name: production
|
name: production
|
||||||
url: https://vtt.f3l.de/
|
url: https://vtt.f3l.de/
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
"gridUnits": "m",
|
"gridUnits": "m",
|
||||||
"primaryTokenAttribute": "combatValues.hitPoints.current",
|
"primaryTokenAttribute": "combatValues.hitPoints.current",
|
||||||
"url": "https://git.f3l.de/dungeonslayers/ds4",
|
"url": "https://git.f3l.de/dungeonslayers/ds4",
|
||||||
"manifest": "https://git.f3l.de/dungeonslayers/ds4/-/blob/master/src/system.json",
|
"manifest": "https://git.f3l.de/dungeonslayers/ds4/-/raw/latest/src/system.json?inline=false",
|
||||||
"download": "https://git.f3l.de/dungeonslayers/ds4/-/archive/master/ds4-master.zip",
|
"download": "https://git.f3l.de/dungeonslayers/ds4/-/jobs/artifacts/latest/download?job=build",
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue