From c577b2c561e10b298c6ca59ef77656b0eecaf4e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Alexandre=20C=C3=B4t=C3=A9?= <marc.cote.19@gmail.com>
Date: Tue, 7 Apr 2020 11:03:48 -0400
Subject: [PATCH 1/2] Use Inform7 interim version for MacOS

---
 .travis.yml | 5 ++++-
 setup.sh    | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 302f06c0..14dc174c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,8 +23,11 @@ matrix:
       python: "3.5"
     - os: linux
       python: "3.6"
-    - os: osx
+    - os: osx  # macOS 10.13
       language: generic
+    - os: osx  # macOS 10.14
+      language: generic
+      osx_image: xcode11.3
 
 install:
   - ./.travis/setup.sh
diff --git a/setup.sh b/setup.sh
index 23505faf..dc1f49a1 100755
--- a/setup.sh
+++ b/setup.sh
@@ -21,9 +21,9 @@ cd textworld/thirdparty/
 if [ ! -e I7_6M62_Linux_all.tar.gz ]; then
     echo "Downloading Inform7 CLI"
     curl -LO http://inform7.com/apps/6M62/I7_6M62_Linux_all.tar.gz
-    if [ "${machine}" == 'Mac' ] && [ ! -e I7-6M62-OSX.dmg ]; then
+    if [ "${machine}" == 'Mac' ] && [ ! -e I7-6M62-OSX-Interim.dmg ]; then
         echo "Downloading Inform7 for Mac"
-        curl -LO http://inform7.com/apps/6M62/I7-6M62-OSX.dmg
+        curl -LO http://inform7.com/apps/6M62/I7-6M62-OSX-Interim.dmg
     fi
 fi
 if [ ! -d inform7-6M62 ]; then
@@ -41,7 +41,7 @@ fi
 # Mount DMG if we're using a Mac
 if [ "${machine}" == 'Mac' ] && [ -e inform7-6M62 ]; then
     echo "Mounting Inform for Mac"
-    hdiutil attach ./I7-6M62-OSX.dmg
+    hdiutil attach ./I7-6M62-OSX-Interim.dmg
 
     echo "Copying Mac compiled inform files"
     current_dir="$(pwd)"

From 85868c731ebee80fe26b54ca87883285e030f6a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Alexandre=20C=C3=B4t=C3=A9?= <marc.cote.19@gmail.com>
Date: Tue, 7 Apr 2020 11:45:05 -0400
Subject: [PATCH 2/2] Add MacOS Catalina CI

---
 .azure/pipelines/macos_catalina_test.yml | 29 ++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .azure/pipelines/macos_catalina_test.yml

diff --git a/.azure/pipelines/macos_catalina_test.yml b/.azure/pipelines/macos_catalina_test.yml
new file mode 100644
index 00000000..e4446de5
--- /dev/null
+++ b/.azure/pipelines/macos_catalina_test.yml
@@ -0,0 +1,29 @@
+# Python package
+# Create and test a Python package on multiple Python versions.
+# Add steps that analyze code, save the dist with the build record, publish to a PyPI-compatible index, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/languages/python
+
+trigger:
+- master
+
+pool:
+  vmImage: 'macOS-latest'
+
+steps:
+- task: UsePythonVersion@0
+  inputs:
+    versionSpec: '3.7'
+  displayName: 'Use Python 3.7'
+
+- script: |
+    brew install graphviz
+    pip install -r requirements.txt
+  displayName: 'Install dependencies'
+
+- script: |
+    ./.travis/setup.sh
+  displayName: 'Install TextWorld'
+
+- script: |
+    ./.travis/test.sh
+  displayName: 'Run tests'