Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
Tor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Benjamin J. Thompson
Tor
Commits
515d190b
Unverified
Commit
515d190b
authored
6 years ago
by
teor
Browse files
Options
Downloads
Patches
Plain Diff
Travis: enable macOS builds
Also: * explain why we don't install zlib Part of 24629.
parent
c53f17fb
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.travis.yml
+20
-0
20 additions, 0 deletions
.travis.yml
with
20 additions
and
0 deletions
.travis.yml
+
20
−
0
View file @
515d190b
...
...
@@ -6,6 +6,7 @@ compiler:
os
:
-
linux
-
osx
## The build matrix in the following stanza expands into builds for each
## OS and compiler.
...
...
@@ -81,7 +82,26 @@ addons:
-
libscrypt-dev
-
libseccomp-dev
## (OSX only) Use the default OSX image
## See https://docs.travis-ci.com/user/reference/osx#os-x-version
## Default is Xcode 9.4 on macOS 10.13 as of August 2018
#osx_image: xcode9.4
before_install
:
## If we're on OSX, homebrew usually needs to updated first
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
## We might be upgrading some useless packages, but that's better than missing an upgrade
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade; fi
install
:
## If we're on OSX use brew to install required dependencies (for Linux, see the "apt:" section above)
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libevent; fi
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install openssl; fi
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install pkg-config; fi
## macOS comes with zlib by default, so the homebrew install is keg-only
# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install zlib; fi
## If we're on OSX also install the optional dependencies
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install libscrypt; fi
## Install conditional features
## Install coveralls
-
if [[ "$COVERAGE_OPTIONS" != "" ]]; then pip install --user cpp-coveralls; fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment