Merge branch 'master' into feature/context-menu

This commit is contained in:
Aaron Riedel 2022-03-07 03:43:55 +01:00
commit efc4cd0d49
Signed by: aaron
GPG key ID: 643004654D40D577

View file

@ -45,7 +45,6 @@ docker-build:
before_script: before_script:
- apt-get update -qq - apt-get update -qq
- apt-get install -qq git
# Setup SSH deploy keys # Setup SSH deploy keys
- 'which ssh-agent || ( apt-get install -qq openssh-client )' - 'which ssh-agent || ( apt-get install -qq openssh-client )'
- eval $(ssh-agent -s) - eval $(ssh-agent -s)
@ -56,7 +55,7 @@ before_script:
deploy_staging: deploy_staging:
stage: deploy stage: deploy
script: script:
- ssh $SSH_SERVER "cd /root && docker-compose up -d bot && exit" - ssh $SSH_SERVER "cd /root && docker-compose pull shbot && docker-compose up -d shbot && exit"
only: only:
- master - master