public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enabled osx on travis (#15855)

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -1,7 +1,16 @@
matrix:
include:
- os: linux
language: python language: python
python: "3.4" python: "3.4"
sudo: required sudo: required
dist: trusty dist: trusty
before_install: ./maintainers/scripts/travis-nox-review-pr.sh nix 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 install: ./maintainers/scripts/travis-nox-review-pr.sh nox
script: ./maintainers/scripts/travis-nox-review-pr.sh build script: ./maintainers/scripts/travis-nox-review-pr.sh build

4
maintainers/scripts/travis-nox-review-pr.sh
View File

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