Merge remote-tracking branch 'origin/master'

This commit is contained in:
Chocobozzz 2019-11-08 14:11:58 +01:00
commit c6ea6de379
No known key found for this signature in database
GPG key ID: 583A612D890159BE

View file

@ -1,7 +1,14 @@
image: framasoft/vuefs:latest
stages:
- test
- deploy
test:
stage: test
script:
- npm install -g yaml-lint
- for f in $(find ./app/ -name "*.yml" -type f);do yamllint $f;done;
pages:
stage: deploy
script:
@ -24,9 +31,16 @@ pages:
#- for f in $(find -type l);do cp --remove-destination $(readlink -f $f) $f;done;
#- mkdir "${HOME}/.ssh"
#- chmod 700 "${HOME}/.ssh"
#- if [ ! -z ${DEPLOYEMENT_KNOWN_HOSTS+x} ]; then echo -e "${DEPLOYEMENT_KNOWN_HOSTS}" > ${HOME}/.ssh/known_hosts; fi
#- echo -e "${DEPLOYEMENT_KNOWN_HOSTS}" > ${HOME}/.ssh/known_hosts;
#- eval `ssh-agent -s`
#- if [ ! -z ${DEPLOYEMENT_KEY+x} ]; then ssh-add <(echo "${DEPLOYEMENT_KEY}" | base64 --decode -i); fi
#- if [ ! -z ${DEPLOYEMENT_KEY+x} ]; then cd public && echo "put -r ." | sftp ${DEPLOYEMENT_USER}@${DEPLOYEMENT_HOST}:../../web; fi
#- ssh-add <(echo "${DEPLOYEMENT_KEY}" | base64 --decode -i);
#- cd public && echo "put -r ." | sftp ${DEPLOYEMENT_USER}@${DEPLOYEMENT_HOST}:../../web;
#only:
#refs:
#- master
#variables:
#- $DEPLOYEMENT_KEY
#- $DEPLOYEMENT_KNOWN_HOSTS
#- $DEPLOYEMENT_USER
#- $DEPLOYEMENT_HOST