Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Homebrew 1.0.0 fallout #483

Merged
merged 9 commits into from Sep 27, 2016

Use XCode8 (and OS X 10.11)

Installing git via Homebrew now requires XCode 8.
Additionally, this configures an OS X 10.11 image on Travis, which
matches what we have deployment in production (the default is an OS X
10.9.5 image on Travis).

With OS X 10.11, the previous launchctl.py module that we had backported
has been superseded by a new mac_service.py module in 2016.3.0.
Hence, backport the new mac_service.py module as well.

saltfs-migration: Ensure that our OS X builders are all running OS X
10.11 and have XCode 8 installed.
  • Loading branch information
aneeshusa committed Sep 26, 2016
commit a040219a871e70c54efcc3f81752b523829251cf
@@ -18,6 +18,7 @@ matrix:
- SALT_NODE_ID=servo-mac1
- SALT_FROM_SCRATCH=true
os: osx
osx_image: xcode8
- env:
- SALT_NODE_ID=servo-linux1
- SALT_FROM_SCRATCH=true
@@ -43,6 +44,7 @@ matrix:
- SALT_NODE_ID=servo-mac1
- SALT_FROM_SCRATCH=false
os: osx
osx_image: xcode8
- env:
- SALT_NODE_ID=servo-linux1
- SALT_FROM_SCRATCH=false

This file was deleted.

ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.