disable travis mac builders and add a mac jenkins build (#3933)

we'll re-enable mac builders when travis recovers and remove the jenkins
build
This commit is contained in:
Paul Kehrer 2017-09-20 20:49:03 +08:00 committed by Alex Gaynor
parent 20721c9ad9
commit 90375552fa
2 changed files with 41 additions and 41 deletions

View file

@ -49,46 +49,46 @@ matrix:
env: TOXENV=pep8
- python: 3.4
env: TOXENV=py3pep8
- language: generic
os: osx
# 8.3 is macOS 10.12.x
# see: https://docs.travis-ci.com/user/osx-ci-environment/
osx_image: xcode8.3
env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
- language: generic
os: osx
osx_image: xcode8.3
env: TOXENV=py34 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
- language: generic
os: osx
osx_image: xcode8.3
env: TOXENV=py35 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
- language: generic
os: osx
osx_image: xcode8.3
env: TOXENV=py36 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
- language: generic
os: osx
osx_image: xcode8.3
env: TOXENV=pypy-nocoverage CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 PYPY_VERSION=pypy2.7-5.8.0
- language: generic
os: osx
osx_image: xcode8.3
env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=0
- language: generic
os: osx
# 7.3 is OS X 10.11.x
osx_image: xcode7.3
env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
- language: generic
os: osx
# 6.4 is OS X 10.10.x
osx_image: xcode6.4
env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
- language: generic
os: osx
osx_image: xcode8.3
env: TOXENV=docs CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
# - language: generic
# os: osx
# # 8.3 is macOS 10.12.x
# # see: https://docs.travis-ci.com/user/osx-ci-environment/
# osx_image: xcode8.3
# env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
# - language: generic
# os: osx
# osx_image: xcode8.3
# env: TOXENV=py34 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
# - language: generic
# os: osx
# osx_image: xcode8.3
# env: TOXENV=py35 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
# - language: generic
# os: osx
# osx_image: xcode8.3
# env: TOXENV=py36 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
# - language: generic
# os: osx
# osx_image: xcode8.3
# env: TOXENV=pypy-nocoverage CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1 PYPY_VERSION=pypy2.7-5.8.0
# - language: generic
# os: osx
# osx_image: xcode8.3
# env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=0
# - language: generic
# os: osx
# # 7.3 is OS X 10.11.x
# osx_image: xcode7.3
# env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
# - language: generic
# os: osx
# # 6.4 is OS X 10.10.x
# osx_image: xcode6.4
# env: TOXENV=py27 CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
# - language: generic
# os: osx
# osx_image: xcode8.3
# env: TOXENV=docs CRYPTOGRAPHY_SUPPRESS_LINK_FLAGS=1
install:
- ./.travis/install.sh

2
Jenkinsfile vendored
View file

@ -17,7 +17,7 @@ def configs = [
],
[
label: 'sierra',
toxenvs: ['py27'],
toxenvs: ['py27', 'py36'],
],
[
label: 'yosemite',