From 4d34ee82c95d03ae7a7cfc4aac30c5f04bd31ca9 Mon Sep 17 00:00:00 2001
From: Jason Rhinelander <jason@imaginary.ca>
Date: Tue, 19 May 2020 22:46:34 -0300
Subject: [PATCH] Move Catalina build to drone (on lokinet-mini)

---
 .drone.jsonnet | 21 +++++++++++++++++++++
 .travis.yml    |  4 ----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 3de99d30e..3b9263eb9 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -65,4 +65,25 @@ local debian_pipeline(name, image, arch='amd64', deps=default_deps, build_type='
                     cmake_extra='-DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 -DDOWNLOAD_SODIUM=ON'),
     debian_pipeline("Debian sid (ARM64)", "debian:sid", arch="arm64"),
     debian_pipeline("Debian buster (armhf)", "arm32v7/debian:buster", arch="arm64", cmake_extra='-DDOWNLOAD_SODIUM=ON'),
+    {
+        kind: 'pipeline',
+        type: 'exec',
+        name: 'macOS (Catalina w/macports)',
+        platform: { os: 'darwin', arch: 'amd64' },
+        environment: { CLICOLOR_FORCE: '1' }, // Lets color through ninja (1.9+)
+        steps: [
+            {
+                name: 'build',
+                commands: [
+                    'git submodule update --init --recursive',
+                    'mkdir build',
+                    'cd build',
+                    'cmake .. -G Ninja -DCMAKE_CXX_FLAGS=-fcolor-diagnostics -DCMAKE_BUILD_TYPE=Release -DWARNINGS_AS_ERRORS=ON',
+                    'ninja -v',
+                    './test/testAll --gtest_color=yes',
+                    './test/catchAll --use-colour yes',
+                ],
+            }
+        ]
+    },
 ]
diff --git a/.travis.yml b/.travis.yml
index f7e1c90a2..2ab92884e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,10 +10,6 @@ matrix:
     os: osx
     osx_image: xcode10.1
     env: BUILD_TYPE=Debug PATH="/usr/local/opt/ccache/libexec:$PATH"
-  - name: "make release (macOS/clang)"
-    os: osx
-    osx_image: xcode11.4
-    env: BUILD_TYPE=Release PATH="/usr/local/opt/ccache/libexec:$PATH"
   - name: "make release (linux/gcc/s390x)"
     arch: s390x
     compiler: gcc