Skip to content

Commit

Permalink
Merge pull request #231 from MarcCote/fix_230
Browse files Browse the repository at this point in the history
Use Inform7 interim version for MacOS
  • Loading branch information
MarcCote authored Apr 8, 2020
2 parents b3498a5 + 85868c7 commit 3341c3f
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 4 deletions.
29 changes: 29 additions & 0 deletions .azure/pipelines/macos_catalina_test.yml
Original file line number Diff line number Diff line change
@@ -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'
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)"
Expand Down

0 comments on commit 3341c3f

Please sign in to comment.