Skip to content

Commit 80a57a0

Browse files
committed
Revert "remove manual homebrew, set addon to update (#171)"
This reverts commit f48956a. Testing as a potential fix for new issues introduced in https://changelog.travis-ci.com/xcode-11-3-1-xcode-11-2-1-xcode-11-1-and-xcode11-images-updated-142286
1 parent 7f056c3 commit 80a57a0

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.travis.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
osx_image: xcode11.3 # Python 3.7.4 running on macOS 10.14
4848
language: shell # 'language: python' is an error on Travis CI macOS
4949
env: PIP=pip3 PYTHON_VERSION=3.7 DEPLOY=true
50-
script: make travisbuild_file
50+
script: brew install jq && make travisbuild_file
5151
- name: "Python 3.7 Windows Single Binary Build"
5252
stage: build
5353
os: windows # Windows 10.0.17134 N/A Build 17134
@@ -68,7 +68,7 @@ jobs:
6868
osx_image: xcode11.3 # Python 3.7.4 running on macOS 10.14.4
6969
language: shell # 'language: python' is an error on Travis CI macOS
7070
env: PIP=pip3 PYTHON_VERSION=3.7 DEPLOY=true
71-
script: make travisbuild_folder
71+
script: brew install jq && make travisbuild_folder
7272
- name: "Python 3.7 Windows npm Build"
7373
stage: build
7474
os: windows # Windows 10.0.17134 N/A Build 17134
@@ -99,10 +99,11 @@ addons:
9999
apt:
100100
packages:
101101
- sed
102-
homebrew:
103-
update: true
104-
packages:
105-
- jq
102+
# homebrew addon is currently broken so we are installing "manually"
103+
# https://travis-ci.community/t/macos-build-fails-because-of-homebrew-bundle-unknown-command/7296/3
104+
# homebrew:
105+
# packages:
106+
# - jq
106107

107108
install:
108109
- ./.travis/install.sh

.travis/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ if [ "$TRAVIS_OS_NAME" = "osx" ] || [ "$TRAVIS_OS_NAME" = "windows" ]; then
1515
# these setup steps are already taken care of for linux in travis's
1616
# images. but, since windows and osx don't 'support' the python language
1717
# option, we have to do this here.
18-
${PYTHON} --version && pip --version
18+
${PYTHON} --version && ${PIP} --version
1919
${PYTHON} -m pip install --upgrade pip setuptools
2020
fi
2121

2222
# virtualenv 20 was a complete rewrite and includes some breaking changes
2323
# with how we were handling things like distutils. These version are now pinned
2424
# to ensure compatability.
25-
pip install "virtualenv==16.7.9" "pipenv==2018.11.26"
25+
${PIP} install "virtualenv==16.7.9" "pipenv==2018.11.26"
2626

2727
# anything running python3 can use the provided Pipfile.lock
2828
if [ "$PYTHON_VERSION" != "2.7" ]; then

0 commit comments

Comments
 (0)