diff options
| -rw-r--r-- | .travis.yml | 19 | ||||
| -rwxr-xr-x | maintainers/scripts/travis-nox-review-pr.sh | 6 |
2 files changed, 19 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 402347d5eda6..bfd7ca34f622 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index db0f449c92af..02e9cbefb34e 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -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" |