rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Deployment to server requires manual action within 1 week"

Browse source 
This reverts commit 891fc2edeb
This commit is contained in:
Joel Collins 2019-08-23 14:31:32 +00:00
parent e7553eef80
commit 96282d4f0f
1 changed files with 1 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
.gitlab-ci.yml
View file

@ -12,22 +12,19 @@ cache:
build: build:
stage: build stage: build
image: electronuserland/builder:wine image: electronuserland/builder:wine
script: script:
- npm install - npm install
- npm run build:app - npm run build:app
- npm run release - npm run release
artifacts: artifacts:
name: "dist" name: "dist"
expire_in: 1 week expire_in: 1 hour
paths: paths:
- "./release-builds/*.AppImage" - "./release-builds/*.AppImage"
- "./release-builds/*.exe" - "./release-builds/*.exe"
- "./release-builds/*.exe.blockmap" - "./release-builds/*.exe.blockmap"
- "./release-builds/latest*.yml" - "./release-builds/latest*.yml"
- "./release-builds/beta*.yml" - "./release-builds/beta*.yml"
only: only:
- web - web
- stable - stable
@ -36,28 +33,19 @@ build:
# Deploy to builds.openflexure.org # Deploy to builds.openflexure.org
deploy: deploy:
stage: deploy stage: deploy
dependencies: dependencies:
- build - build
image: ubuntu:latest image: ubuntu:latest
before_script: before_script:
- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
- eval $(ssh-agent -s) - eval $(ssh-agent -s)
- ssh-add <(echo "$SSH_PRIVATE_KEY_BATH_OPENFLEXURE_BASE64" | base64 --decode) - ssh-add <(echo "$SSH_PRIVATE_KEY_BATH_OPENFLEXURE_BASE64" | base64 --decode)
- mkdir -p ~/.ssh - mkdir -p ~/.ssh
- echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config - echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config
script: script:
- 'which rsync || ( apt-get update -y && apt-get install rsync -y )' - 'which rsync || ( apt-get update -y && apt-get install rsync -y )'
- 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"
when: manual
allow_failure: false
only: only:
- web - web
- stable - stable
- tags