Skip to content

Commit

Permalink
Enable MacOS testing on Travis, disable 3.6 testing on Jenkins
Browse files Browse the repository at this point in the history
Travis MacOS is much more functional than it used to be, and on
ci.cryptography.org we're hitting:
  MagicStack/immutables#7

So let's try turning on Travis's MacOS and see how it goes, while
scaling back our Jenkins testing so that bug doesn't block everything.
  • Loading branch information
njsmith committed Jul 30, 2018
1 parent fd0d877 commit cef5002
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 1 deletion.
9 changes: 9 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,15 @@ matrix:
- python: 3.8-dev
dist: xenial
sudo: required
- os: osx
language: generic
env: MACPYTHON=3.5.4
- os: osx
language: generic
env: MACPYTHON=3.6.6
- os: osx
language: generic
env: MACPYTHON=3.7.0

script:
- ci/travis.sh
3 changes: 2 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
def configs = [
[
label: 'sierra',
pyversions: ['python3.5', 'python3.6'],
// pyversions: ['python3.5', 'python3.6'],
pyversions: ['python3.5'],
],
]

Expand Down
12 changes: 12 additions & 0 deletions ci/travis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ YAPF_VERSION=0.20.1

git rev-parse HEAD

if [ "$TRAVIS_OS_NAME" = "osx" ]; then
curl -Lo macpython.pkg https://www.python.org/ftp/python/${MACPYTHON}/python-${MACPYTHON}-macosx10.6.pkg
sudo installer -pkg macpython.pkg -target /
ls /Library/Frameworks/Python.framework/Versions/*/bin/
PYTHON_EXE=/Library/Frameworks/Python.framework/Versions/*/bin/python3
# The pip in older MacPython releases doesn't support a new enough TLS
curl https://bootstrap.pypa.io/get-pip.py | sudo $PYTHON_EXE
sudo $PYTHON_EXE -m pip install virtualenv
$PYTHON_EXE -m virtualenv testenv
source testenv/bin/activate
fi

if [ "$USE_PYPY_NIGHTLY" = "1" ]; then
curl -fLo pypy.tar.bz2 http://buildbot.pypy.org/nightly/py3.5/pypy-c-jit-latest-linux64.tar.bz2
if [ ! -s pypy.tar.bz2 ]; then
Expand Down

0 comments on commit cef5002

Please sign in to comment.