diff options
| author | Domen Kožar <domen@dev.si> | 2016-08-13 14:17:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-13 14:17:59 +0200 |
| commit | 49222660fc70a3cf27b67368afae96b691ec7260 (patch) | |
| tree | bcc8ef5437c2aeefac00866343978ff8fa6f1013 | |
| parent | 5164b2dec37c6911bea79f40b73ec2535db89a58 (diff) | |
| parent | a30a34b6f36fa1e51c84b29ed0fe6a231e849f28 (diff) | |
Merge pull request #17256 from matthewbauer/patch-4
Travis fixes
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | maintainers/scripts/travis-nox-review-pr.sh | 9 | ||||
| -rw-r--r-- | pkgs/tools/package-management/nox/default.nix | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 77881dbc492c..e1cc9890df25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,10 +11,10 @@ matrix: dist: trusty before_script: - sudo mount -o remount,exec,size=2G,mode=755 /run/user - script: ./maintainers/scripts/travis-nox-review-pr.sh pr + script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr - os: osx osx_image: xcode7.3 - script: ./maintainers/scripts/travis-nox-review-pr.sh pr + script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr git: depth: 1 env: diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index 13df5087fad5..8ff2258162fb 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -44,6 +44,13 @@ while test -n "$1"; do nix-shell --packages nixpkgs-lint --run "nixpkgs-lint -f $TRAVIS_BUILD_DIR" ;; + nox) + echo "=== Fetching Nox from binary cache" + + # build nox silently so it's not in the log + nix-build "<nixpkgs>" -A nox + ;; + pr) if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo "=== No pull request found" @@ -55,7 +62,7 @@ while test -n "$1"; do token="--token $GITHUB_TOKEN" fi - nix-shell --packages nox git --run "nox-review pr --slug $TRAVIS_REPO_SLUG $token $TRAVIS_PULL_REQUEST" + nix-shell --packages nox --run "nox-review pr --slug $TRAVIS_REPO_SLUG $token $TRAVIS_PULL_REQUEST" fi ;; diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix index 04a31bd30b7c..2dffcef48fbe 100644 --- a/pkgs/tools/package-management/nox/default.nix +++ b/pkgs/tools/package-management/nox/default.nix @@ -1,4 +1,4 @@ -{ lib, pythonPackages, fetchurl }: +{ lib, pythonPackages, fetchurl, git }: pythonPackages.buildPythonApplication rec { name = "nox-${version}"; @@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec { sha256 = "11f6css8rnh7qz55z7i81cnb5h9ys98fqxq3fps3hsh64zlydj52"; }; - buildInputs = [ pythonPackages.pbr ]; + buildInputs = [ pythonPackages.pbr git ]; propagatedBuildInputs = with pythonPackages; [ dogpile_cache |