From ac25e208d46107616cc714bad02e20aaae982edf Mon Sep 17 00:00:00 2001
From: Gaëtan Gilbert
Date: Wed, 11 Mar 2020 14:25:21 +0100
Subject: Update Azure MacOS version 10.13 -> 10.14

10.13 is deprecated as an azure VM

Close #11449
---
 azure-pipelines.yml             |  2 +-
 dev/build/osx/make-macos-dmg.sh | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index aba2b05037..98e17e8fe8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -40,7 +40,7 @@ jobs:
 
 - job: macOS
   pool:
-    vmImage: 'macOS-10.13'
+    vmImage: 'macOS-10.14'
 
   variables:
     MACOSX_DEPLOYMENT_TARGET: '10.11'
diff --git a/dev/build/osx/make-macos-dmg.sh b/dev/build/osx/make-macos-dmg.sh
index 3a096fec06..35d0379008 100755
--- a/dev/build/osx/make-macos-dmg.sh
+++ b/dev/build/osx/make-macos-dmg.sh
@@ -24,4 +24,14 @@ mkdir -p _build
 # Temporary countermeasure to hdiutil error 5341
 # head -c9703424 /dev/urandom > $DMGDIR/.padding
 
-hdiutil create -imagekey zlib-level=9 -volname "coq-$VERSION-installer-macos" -srcfolder "$DMGDIR" -ov -format UDZO "_build/coq-$VERSION-installer-macos.dmg"
+hdi_opts=(-volname "coq-$VERSION-installer-macos"
+          -srcfolder "$DMGDIR"
+          -ov # overwrite existing file
+          -format UDZO
+          -imagekey "zlib-level=9"
+
+          # needed for backward compat since macOS 10.14 which uses APFS by default
+          # see discussion in #11803
+          -fs hfs+
+         )
+hdiutil create "${hdi_opts[@]}" "_build/coq-$VERSION-installer-macos.dmg"
-- 
cgit v1.2.3