From 5a928a34fc04369239ddf2c3c693f0a15210dccf Mon Sep 17 00:00:00 2001
From: Drew Short <warrick@sothr.com>
Date: Tue, 13 Feb 2018 21:43:34 -0600
Subject: [PATCH] Removing deploy step because git is not working as it should

---
 .gitlab-ci.yml        | 11 -----------
 package-and-deploy.sh |  1 +
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3c8c912..9bc6844 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,15 +15,4 @@ build-resume:
     paths:
     - DPSResume.pdf
     - ResumeSite.tar.gz
-
-deploy-resume:
-    stage: deploy
-    script:
-        - mkdir -p ~/.ssh && echo "$SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
-        - git config --global user.email "gitlab-runner@shinigami.sothr.com" && git config --global user.name "GitLab Runner"
-        - ./package-and-deploy.sh
-    only:
-        - master
-    tags:
-        - linux
  
diff --git a/package-and-deploy.sh b/package-and-deploy.sh
index 0ec4811..75d8f0c 100755
--- a/package-and-deploy.sh
+++ b/package-and-deploy.sh
@@ -36,3 +36,4 @@ git push ssh://git@gitlab.sothr.com:9141/warricksothr/resume.git HEAD:gh-pages -
 git clean -fq .
 git clean -fdXq
 git checkout master
+git pull