Enabled osx on travis (#15855)

This commit is contained in:
Marc Scholten 2016-05-31 12:34:59 +02:00 committed by Domen Kožar
parent cf32f82b8d
commit 36cc45782b
2 changed files with 19 additions and 6 deletions

View file

@ -1,7 +1,16 @@
language: python
python: "3.4"
sudo: required
dist: trusty
before_install: ./maintainers/scripts/travis-nox-review-pr.sh nix
matrix:
include:
- os: linux
language: python
python: "3.4"
sudo: required
dist: trusty
before_install: ./maintainers/scripts/travis-nox-review-pr.sh nix
- os: osx
language: generic
osx_image: xcode7.3
before_install:
- brew upgrade && brew install python
- ./maintainers/scripts/travis-nox-review-pr.sh nix
install: ./maintainers/scripts/travis-nox-review-pr.sh nox
script: ./maintainers/scripts/travis-nox-review-pr.sh build

View file

@ -27,7 +27,11 @@ elif [[ $1 == build ]]; then
nix-build nixos/release.nix -A options
echo "=== Checking tarball creation"
nix-build pkgs/top-level/release.nix -A tarball
if [[ $TRAVIS_OS_NAME == "osx" ]]; then
echo "Skipped, as not working on darwin"
else
nix-build pkgs/top-level/release.nix -A tarball
fi
if [[ $TRAVIS_PULL_REQUEST == false ]]; then
echo "=== Not a pull request"