Cleanup and styling of gitlabci

.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"'