diff --git a/invent/websites-generic.yml b/invent/websites-generic.yml index 0901a73..a3e69a8 100644 --- a/invent/websites-generic.yml +++ b/invent/websites-generic.yml @@ -1,12 +1,14 @@ before_script: - apt-get update -y && apt-get install openssh-client rsync -y - eval $(ssh-agent -s) - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - 'mkdir -p ~/.ssh && chmod 700 ~/.ssh' - echo "$OLIOS_SSH_HOST_KEYS" >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts pages: stage: deploy script: - rsync -Hav --delete . "sitedeployer@olios.kde.org:/srv/www/generated/$WEBSITE_DIR/" + only: + - master diff --git a/invent/websites-jekyll.yml b/invent/websites-jekyll.yml index 9e11a90..c96e5e1 100644 --- a/invent/websites-jekyll.yml +++ b/invent/websites-jekyll.yml @@ -1,20 +1,22 @@ image: ruby:2.3 cache: paths: - vendor/ before_script: - apt-get update -y && apt-get install openssh-client rsync -y - eval $(ssh-agent -s) - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - 'mkdir -p ~/.ssh && chmod 700 ~/.ssh' - echo "$OLIOS_SSH_HOST_KEYS" >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts - bundle install --path vendor pages: stage: deploy script: - bundle exec jekyll build -d public - rsync -Hav --delete public/ "sitedeployer@olios.kde.org:/srv/www/generated/$WEBSITE_DIR/" + only: + - master diff --git a/invent/websites-sphinx.yml b/invent/websites-sphinx.yml index 4e697d0..e13a783 100644 --- a/invent/websites-sphinx.yml +++ b/invent/websites-sphinx.yml @@ -1,27 +1,29 @@ image: python:3 variables: PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" cache: paths: - .cache/pip - venv before_script: - apt-get update -y && apt-get install openssh-client rsync -y - eval $(ssh-agent -s) - echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null - 'mkdir -p ~/.ssh && chmod 700 ~/.ssh' - echo "$OLIOS_SSH_HOST_KEYS" >> ~/.ssh/known_hosts - chmod 644 ~/.ssh/known_hosts - pip install virtualenv - virtualenv venv - source venv/bin/activate pages: stage: deploy script: - pip install -r requirements.txt - sphinx-build -a . public - rsync -Hav --delete public/ "sitedeployer@olios.kde.org:/srv/www/generated/$WEBSITE_DIR/" + only: + - master