Tidied up CI

This commit is contained in:
Joel Collins 2020-05-26 15:05:37 +01:00
parent c72247fab6
commit 9e34cb495a
4 changed files with 3 additions and 45 deletions

View file

@ -38,7 +38,7 @@ build:
- mkdir -p "release-builds"
# Build electron app
- npm run build:app
- if [ "$CI_COMMIT_REF_NAME" == "stable" ]; then npm run release; else npm run release:pre; fi
- npm run release
artifacts:
name: "dist"
@ -52,9 +52,9 @@ build:
only:
- merge_requests
- stable
- master
- web
- tags
# Deploy to builds.openflexure.org
@ -82,4 +82,4 @@ deploy:
- ssh -t ci-user@openflexure.bath.ac.uk "/var/www/build/update-latest.py"
only:
- stable
- tags