From 8bc3a288ee9abcbb86aec7f4246664800aabab3c Mon Sep 17 00:00:00 2001
From: Daan Sprenkels <hello@dsprenkels.com>
Date: Fri, 29 Mar 2019 15:29:59 +0100
Subject: [PATCH] ci/deploy: Pull code instead of push

---
 .gitlab-ci.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2d67960..d9e72f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,16 +29,13 @@ deploy:
         marietje-zuid.science.ru.nl ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBLticd8NEr6r5QJ2VKFX/rVcfkhM3IcAr+hCgc/kgBSIPEzyRIXd74glIx17FJxvhi2KLC5D+EVtu9CSZhYSe10=
         EOF
 
-        # Upload to marietje-zuid
-        git push root@marietje-zuid.science.ru.nl:/srv/MarietjeDjango marietje-zuid
-
         # Deploy the new version
         cat <<EOF | ssh root@marietje-zuid.science.ru.nl
         readonly PYTHON="/srv/MarietjeDjango/django_env/bin/python"
         readonly MANAGE="/srv/MarietjeDjango/marietje/manage.py"
 
         systemctl stop MarietjeDjango.service
-        git --git-dir=/srv/MarietjeDjango/.git merge marietje-zuid
+        git --git-dir=/srv/MarietjeDjango/.git pull origin marietje-zuid
         "$PYTHON" "$MANAGE" migrate --noinput
         "$PYTHON" "$MANAGE" collectstatic --noinput
         systemctl start MarietjeDjango.service