Run build on merge request, not on tags, deploy ONLY on stable merge
This commit is contained in:
parent
96282d4f0f
commit
36d73efd69
1 changed files with 4 additions and 5 deletions
|
|
@ -18,7 +18,7 @@ build:
|
||||||
- npm run release
|
- npm run release
|
||||||
artifacts:
|
artifacts:
|
||||||
name: "dist"
|
name: "dist"
|
||||||
expire_in: 1 hour
|
expire_in: 1 week
|
||||||
paths:
|
paths:
|
||||||
- "./release-builds/*.AppImage"
|
- "./release-builds/*.AppImage"
|
||||||
- "./release-builds/*.exe"
|
- "./release-builds/*.exe"
|
||||||
|
|
@ -26,9 +26,9 @@ build:
|
||||||
- "./release-builds/latest*.yml"
|
- "./release-builds/latest*.yml"
|
||||||
- "./release-builds/beta*.yml"
|
- "./release-builds/beta*.yml"
|
||||||
only:
|
only:
|
||||||
- web
|
- merge_requests
|
||||||
- stable
|
- stable
|
||||||
- tags
|
- web
|
||||||
|
|
||||||
# Deploy to builds.openflexure.org
|
# Deploy to builds.openflexure.org
|
||||||
deploy:
|
deploy:
|
||||||
|
|
@ -47,5 +47,4 @@ deploy:
|
||||||
- rsync -hrvz -e ssh release-builds/ ci-user@openflexure.bath.ac.uk:/var/www/build/openflexure-ev/
|
- rsync -hrvz -e ssh release-builds/ ci-user@openflexure.bath.ac.uk:/var/www/build/openflexure-ev/
|
||||||
- ssh -t ci-user@openflexure.bath.ac.uk "/var/www/build/update-latest.py"
|
- ssh -t ci-user@openflexure.bath.ac.uk "/var/www/build/update-latest.py"
|
||||||
only:
|
only:
|
||||||
- web
|
|
||||||
- stable
|
- stable
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue