From 9ad0e4175fbd64c51909c00915fc128f8bfdef9a Mon Sep 17 00:00:00 2001
From: Felix Breidenstein <mail@felixbreidenstein.de>
Date: Thu, 2 Apr 2020 23:58:24 +0200
Subject: [PATCH] Cleanup and styling of gitlabci

---
 .gitlab-ci.yml | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7dcec1..9ee0fb1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,17 +10,17 @@ stages:
 build:
   stage: build
   image: golang:1-alpine
-  script:
-    - apk add --no-cache imagemagick pkgconfig imagemagick-dev gcc libc-dev
-    - mkdir previews
-    - go run main.go
-    - mkdir dist
-    - mv index.html dist/
-    - mv previews/ dist/
-    - mv talks/ dist/
   artifacts:
     paths:
       - dist
+  script:
+    - apk add --no-cache imagemagick pkgconfig imagemagick-dev gcc libc-dev
+    - mkdir previews
+    - mkdir dist
+    - go run main.go
+    - mv index.html dist/
+    - mv previews/ dist/
+    - mv talks/ dist/
 
 deploy:
   stage: deploy
@@ -28,7 +28,5 @@ deploy:
   script:
     - npm i -g netlify-cli
     - netlify deploy --site $NETLIFY_SITE_ID --auth $NETLIFY_AUTH_TOKEN --prod
-  dependencies:
-    - build
-  only:
-    - master
+  rules:
+    - 'if $CI_COMMIT_BRANCH == "master"'