Commit 36d73efd authored by Joel Collins's avatar Joel Collins
Browse files

Run build on merge request, not on tags, deploy ONLY on stable merge

parent 96282d4f

.gitlab-ci.yml

+4 −5
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ build: 
    - npm run release

  artifacts:

    name: "dist"

    expire_in: 1 hour

    expire_in: 1 week

    paths:

      - "./release-builds/*.AppImage"

      - "./release-builds/*.exe"
@@ -26,9 +26,9 @@ build: 
      - "./release-builds/latest*.yml"

      - "./release-builds/beta*.yml"

  only:

    - web

    - merge_requests

    - stable

    - tags

    - web

    

# Deploy to builds.openflexure.org

deploy:
@@ -47,5 +47,4 @@ deploy: 
    - 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"

  only:

    - web

    - stable