From: Chris Cormack <chris@bigballofwax.co.nz>
Date: Wed, 22 May 2019 15:21:14 +0000 (+0000)
Subject: Update .gitlab-ci.yml
X-Git-Tag: 19.05.00^2
X-Git-Url: http://git.equinoxoli.org/?p=kohadocs.git;a=commitdiff_plain;h=ad104d2318688d4f9d4201baf95bcbf0a4e97d44

Update .gitlab-ci.yml
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1497496..efb7952 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,41 +1,26 @@
-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_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_HOSTKEYS" > ~/.ssh/known_hosts'
-
-
 image: debian:unstable
 
-#test:
-#  stage: test
-#  script:
-#  - apt-get update
-#  - DEBIAN_FRONTEND=noninteractive apt-get install -y python3-sphinx  python3-sphinxcontrib.spelling make
-#  - for l in `ls locales` ; do make -e SPHINXOPTS="-D language='$l'" BUILDDIR="build/$l" html ; make -e SPHINXOPTS="-D language='$l'" BUILDDIR="build/$l" epub ; done
-#  only:
-#  - master
 
 production:
-    only:
-      - master@koha-community/koha-manual
+    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_key")
+ 
+      # For Docker builds disable host key checking. Be aware that by adding that
+      - 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_HOSTKEYS" > ~/.ssh/known_hosts'
     cache:
        paths:
         - build/en/html
@@ -46,5 +31,5 @@ production:
     - make all_html # build/LANG/html
     - rsync -c -u -r -e "ssh" --progress build/* chrisc@www.koha-community.org:/var/www/manual/19.05/
     only:
-        - master
+        - master@koha-community/koha-manual
     environment: production