nox: add git as build input
also: add nox as separate target to make build log more quiet
This commit is contained in:
parent
d7176a83a7
commit
a30a34b6f3
|
@ -11,10 +11,10 @@ matrix:
|
||||||
dist: trusty
|
dist: trusty
|
||||||
before_script:
|
before_script:
|
||||||
- sudo mount -o remount,exec,size=2G,mode=755 /run/user
|
- 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
|
- os: osx
|
||||||
osx_image: xcode7.3
|
osx_image: xcode7.3
|
||||||
script: ./maintainers/scripts/travis-nox-review-pr.sh pr
|
script: ./maintainers/scripts/travis-nox-review-pr.sh nox pr
|
||||||
git:
|
git:
|
||||||
depth: 1
|
depth: 1
|
||||||
env:
|
env:
|
||||||
|
|
|
@ -44,6 +44,13 @@ while test -n "$1"; do
|
||||||
nix-shell --packages nixpkgs-lint --run "nixpkgs-lint -f $TRAVIS_BUILD_DIR"
|
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)
|
pr)
|
||||||
if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
|
if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
|
||||||
echo "=== No pull request found"
|
echo "=== No pull request found"
|
||||||
|
@ -55,7 +62,7 @@ while test -n "$1"; do
|
||||||
token="--token $GITHUB_TOKEN"
|
token="--token $GITHUB_TOKEN"
|
||||||
fi
|
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
|
fi
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
{ lib, pythonPackages, fetchurl }:
|
{ lib, pythonPackages, fetchurl, git }:
|
||||||
|
|
||||||
pythonPackages.buildPythonApplication rec {
|
pythonPackages.buildPythonApplication rec {
|
||||||
name = "nox-${version}";
|
name = "nox-${version}";
|
||||||
|
@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
|
||||||
sha256 = "11f6css8rnh7qz55z7i81cnb5h9ys98fqxq3fps3hsh64zlydj52";
|
sha256 = "11f6css8rnh7qz55z7i81cnb5h9ys98fqxq3fps3hsh64zlydj52";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [ pythonPackages.pbr ];
|
buildInputs = [ pythonPackages.pbr git ];
|
||||||
|
|
||||||
propagatedBuildInputs = with pythonPackages; [
|
propagatedBuildInputs = with pythonPackages; [
|
||||||
dogpile_cache
|
dogpile_cache
|
||||||
|
|
Loading…
Reference in a new issue