From a3ebf6974d5b467c7a04fa9c6f1798cc5b989cc7 Mon Sep 17 00:00:00 2001
From: Derek Feichtinger <derek.feichtinger@psi.ch>
Date: Tue, 28 May 2019 23:48:49 +0200
Subject: [PATCH] added new gitlab CI file and saved original one

---
 .gitlab-ci.yml      | 53 ++++++++++++++++++++++++++++++++-------------
 .gitlab-ci.yml.orig | 26 ++++++++++++++++++++++
 2 files changed, 64 insertions(+), 15 deletions(-)
 create mode 100644 .gitlab-ci.yml.orig

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7167efd..3cc2c9c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,26 +1,49 @@
-image: ruby:2.3
+stages:
+  - test
+  - deploy
+
+image: alpine:latest
 
 variables:
   JEKYLL_ENV: production
 
-test:
-  stage: test
-  script:
-  - sh ./var/build.sh
-  - bundle exec jekyll build -d test
-  artifacts:
-    paths:
-    - test
-  except:
-  - master
+before_script:
+  - apk list -I
+  - >
+    apk --no-cache add libatomic readline readline-dev libxml2 libxml2-dev
+    ncurses-terminfo-base ncurses-terminfo
+    libxslt libxslt-dev zlib-dev zlib
+    ruby ruby-dev yaml yaml-dev
+    libffi-dev build-base git nodejs
+  - gem install bundler --no-document
+  - pwd
+  - ls -l
+  - bundle install
 
+######################################################################
+# this defines the job (for gitlab-pages it has the special name "pages")
 pages:
   stage: deploy
   script:
-  - sh ./var/build.sh
-  - bundle exec jekyll build -d public
+    - pwd
+    - ls -l
+    - sh ./var/build.sh
+    - bundle exec jekyll --version
+    - bundle exec jekyll build -d public
+
+# defines what is produced by the scripts (the "artifacts")
   artifacts:
     paths:
-    - public
+      - public
+
+  # the tags define which runners (builders) will be selected. A
+  # suitable runner must have an identical tag
+  tags:
+    - shared
+    - gitlab-pages
+    - docker
+
+  # the "pages" job is only to be run for the master branch
   only:
-  - master
+    - master
+
diff --git a/.gitlab-ci.yml.orig b/.gitlab-ci.yml.orig
new file mode 100644
index 0000000..7167efd
--- /dev/null
+++ b/.gitlab-ci.yml.orig
@@ -0,0 +1,26 @@
+image: ruby:2.3
+
+variables:
+  JEKYLL_ENV: production
+
+test:
+  stage: test
+  script:
+  - sh ./var/build.sh
+  - bundle exec jekyll build -d test
+  artifacts:
+    paths:
+    - test
+  except:
+  - master
+
+pages:
+  stage: deploy
+  script:
+  - sh ./var/build.sh
+  - bundle exec jekyll build -d public
+  artifacts:
+    paths:
+    - public
+  only:
+  - master