From 57985da1a13ed5637c58b3035b94988daaf3e567 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Wed, 6 Jun 2018 16:04:29 +0100
Subject: [CI] Fix deployment

---
 .gitlab-ci.yml    | 8 ++++----
 scripts/deploy.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 727d67bc..629c744a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,6 @@ services:
 
 
 before_script:
-  - apk add --update ruby ruby-dev ruby-rdoc ruby-irb
   - apk add --update tini
   - apk add --update git
   - apk add --update build-base
@@ -26,9 +25,6 @@ before_script:
   - apk add --update autoconf
   - apk add --update automake
   - apk add --update libtool
-  - pip install pipenv
-  - pipenv sync --dev --three
-  - gem install scss_lint
 
 stages:
   - test
@@ -37,6 +33,10 @@ stages:
 test:
   stage: test
   script:
+    - apk add --update ruby ruby-dev ruby-rdoc ruby-irb
+    - pip install pipenv
+    - pipenv sync --dev --three
+    - gem install scss_lint
     - pipenv run lint
     - pipenv run lintscss
     - pipenv run python gunicorn_config.py
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 4a4604c6..f4799749 100644
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Build and deploy on master branch
-if [[ $TRAVIS_BRANCH == 'master' && $TRAVIS_PULL_REQUEST == 'false' ]]; then
+if [[ $CI_COMMIT_REF_SLUG == 'master' ]]; then
     echo "Connecting to docker hub"
     echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
 
-- 
cgit v1.2.3