From 7ccb5d58030ca589baa5ac379621c16faff754b2 Mon Sep 17 00:00:00 2001
From: Malte Schmitz <schmitz@isp.uni-luebeck.de>
Date: Sat, 17 Apr 2021 20:26:34 +0200
Subject: [PATCH] Simplify CI script
---
.gitlab-ci.yml | 52 ++++++++++++++++++++++++--------------------------
1 file changed, 25 insertions(+), 27 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08e2ad6e..6cb74b2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,44 +6,42 @@ cache:
paths:
- vendor/
-before_script:
- # Install ssh-agent if not already installed, it is required by Docker.
- # (change apt-get to yum if you use a CentOS-based image)
- - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
-
- # Run ssh-agent (inside the build environment)
- - eval $(ssh-agent -s)
-
- # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
- - ssh-add <(echo "$SSH_PRIVATE_KEY")
-
- # For Docker builds disable host key checking. Be aware that by adding that
- # you are suspectible to man-in-the-middle attacks.
- # WARNING: Use this only with the Docker executor, if you use it with shell
- # you will overwrite your user's SSH config.
- # - mkdir -p ~/.ssh
- # - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
- # In order to properly check the server's host key, assuming you created the
- # SSH_SERVER_HOSTKEYS variable previously, uncomment the following two lines
- # instead.
- - mkdir -p ~/.ssh
- - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEY" > ~/.ssh/known_hosts'
-
deploy:
only:
- master
+ before_script:
+ # Install ssh-agent if not already installed, it is required by Docker.
+ # (change apt-get to yum if you use a CentOS-based image)
+ - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+
+ # Run ssh-agent (inside the build environment)
+ - eval $(ssh-agent -s)
+
+ # Add the SSH key stored in SSH_PRIVATE_KEY variable to the agent store
+ - ssh-add <(echo "$SSH_PRIVATE_KEY")
+
+ # For Docker builds disable host key checking. Be aware that by adding that
+ # you are suspectible to man-in-the-middle attacks.
+ # WARNING: Use this only with the Docker executor, if you use it with shell
+ # you will overwrite your user's SSH config.
+ # - mkdir -p ~/.ssh
+ # - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
+ # In order to properly check the server's host key, assuming you created the
+ # SSH_SERVER_HOSTKEYS variable previously, uncomment the following two lines
+ # instead.
+ - mkdir -p ~/.ssh
+ - '[[ -f /.dockerenv ]] && echo "$SSH_SERVER_HOSTKEY" > ~/.ssh/known_hosts'
script:
- bundle install --path=vendor/
- bundle exec jekyll build
- rsync -6av --delete-after _site/ chaotikum-org@web.chaotikum.net:/var/www/chaotikum.org/
pages:
+ only:
+ - master
script:
- bundle install --path=vendor/
- bundle exec jekyll build
- - mv _site public
artifacts:
paths:
- - public
- only:
- - master
+ - _site
--
GitLab