From 4579095afc79243c592f4a60cbe7d261e245880a Mon Sep 17 00:00:00 2001
From: Maarten Billemont <lhunath@lyndir.com>
Date: Tue, 5 Jun 2018 12:54:09 -0400
Subject: [PATCH] Tweak GitLab CI requisites.

---
 .gitlab-ci.yml | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3501172c..811085d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,26 +4,32 @@ variables:
 
 stages:
   - build
+  - deploy
 
 build_project:
   stage: build
   script:
+    - "( brew install libsodium json-c )"
     - "( ./lib/bin/build_libsodium-macos )"
     - "( cd ./platform-independent/cli-c && ./clean && targets='mpw mpw-bench mpw-tests' ./build && ./mpw-tests && ./mpw-cli-tests )"
     - "( cd ./gradle && ./gradlew --info clean test )"
     - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword iOS' -sdk iphonesimulator clean build )"
     - "( xcodebuild -workspace platform-darwin/MasterPassword.xcworkspace -configuration 'Test' -scheme 'MasterPassword macOS' clean build )"
   tags:
-    - xcode-9
+    - brew
+    - java
+    - xcode_9
   only:
     - master
 
 pages:
-  stage: build
+  stage: deploy
   script:
-  - exec jekyll build -d public
+    - exec jekyll build -d public
   artifacts:
     paths:
-    - public
+      - public
+  tags:
+    - jekyll
   only:
-  - gh-pages
+    - gh-pages