From d53532f5f3d2611db8aab35f7f1259f095b3745a Mon Sep 17 00:00:00 2001
From: Bryan Tan <techniux@gmail.com>
Date: Thu, 19 Mar 2020 00:14:27 -0700
Subject: [PATCH] Switch CI to build on MacOS 10.15

---
 azure-pipelines/continuous-integration.yml | 2 +-
 azure-pipelines/release.yml                | 4 ++--
 azure-pipelines/steps/build_mac.yml        | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/azure-pipelines/continuous-integration.yml b/azure-pipelines/continuous-integration.yml
index 57a16245..8d7b585c 100644
--- a/azure-pipelines/continuous-integration.yml
+++ b/azure-pipelines/continuous-integration.yml
@@ -54,7 +54,7 @@ stages:
 
       - job: macOS
         pool:
-          vmImage: 'macOS-10.13'
+          vmImage: 'macOS-10.15'
         displayName: 'Test Xournal++ on MacOS'
         steps:
           - template: steps/build_mac.yml
diff --git a/azure-pipelines/release.yml b/azure-pipelines/release.yml
index c1b9238d..8f464010 100644
--- a/azure-pipelines/release.yml
+++ b/azure-pipelines/release.yml
@@ -114,14 +114,14 @@ stages:
 
       - job: macOS
         pool:
-          vmImage: 'macOS-10.13'
+          vmImage: 'macOS-10.15'
         displayName: 'Build for macOS'
         condition: always()
         steps:
           - template: steps/build_mac.yml
             parameters:
               build_type: 'RelWithDebInfo'
-              cmake_flags: ''
+              cmake_flags: '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13'
           - bash: |
               export PATH="$HOME/.local/bin:/Users/git-bin/gtk/inst/bin:$PATH"
               ./build-app.sh /Users/git-bin/gtk
diff --git a/azure-pipelines/steps/build_mac.yml b/azure-pipelines/steps/build_mac.yml
index 2777c31a..8afde65d 100644
--- a/azure-pipelines/steps/build_mac.yml
+++ b/azure-pipelines/steps/build_mac.yml
@@ -4,7 +4,8 @@ parameters:
 
 steps:
   - bash: |
-      ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall)"
+      # Ignore Homebrew uninstall errors
+      ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/uninstall)" || true
     displayName: 'Uninstall brew'
   - bash: |
       cd /Users
@@ -33,7 +34,9 @@ steps:
       unzip ninja-mac.zip -d /Users/git-bin/gtk/inst/bin
     displayName: 'Get Ninja'
   - bash: |
-      curl -L -o boost_1_72_0.tar.gz https://dl.bintray.com/boostorg/release/1.72.0/source/boost_1_72_0.tar.gz
+      set -e
+      # Using SourceForge instead of bintray due to boostorg/boost#299
+      curl -L -o boost_1_72_0.tar.gz https://sourceforge.net/projects/boost/files/boost/1.72.0/boost_1_72_0.tar.gz/download
       tar -xzf boost_1_72_0.tar.gz
       cd boost_1_72_0
       ./bootstrap.sh --prefix=/usr/local/boost-1.72.0