about summary refs log tree commit diff
diff options
context:
space:
mode:
authorGeorges Dubus <georges.dubus@gmail.com>2014-09-23 14:35:23 +0200
committerGeorges Dubus <georges.dubus@gmail.com>2014-09-23 14:35:23 +0200
commit2498984aada9eb72c4762a884c35f3b00a997a51 (patch)
tree82359efef31ef27481e4876dd11cfa03c9b76922
parent9f057131f1e6c6510d7fca70276bfcf798f86097 (diff)
parentaf2199e9adff61b9b009b63ddb816b1916b6686b (diff)
downloadnixlib-2498984aada9eb72c4762a884c35f3b00a997a51.tar
nixlib-2498984aada9eb72c4762a884c35f3b00a997a51.tar.gz
nixlib-2498984aada9eb72c4762a884c35f3b00a997a51.tar.bz2
nixlib-2498984aada9eb72c4762a884c35f3b00a997a51.tar.lz
nixlib-2498984aada9eb72c4762a884c35f3b00a997a51.tar.xz
nixlib-2498984aada9eb72c4762a884c35f3b00a997a51.tar.zst
nixlib-2498984aada9eb72c4762a884c35f3b00a997a51.zip
Merge pull request #4229 from madjar/master
Fixes to the travis script
-rwxr-xr-xmaintainers/scripts/travis-nox-review-pr.sh9
1 files changed, 6 insertions, 3 deletions
diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh
index 1fe4ed4f3d29..5b0ef380f9af 100755
--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@@ -7,8 +7,11 @@ source $HOME/.nix-profile/etc/profile.d/nix.sh
 
 # Make sure we can use hydra's binary cache
 sudo mkdir /etc/nix
-echo "binary-caches = http://cache.nixos.org http://hydra.nixos.org" | sudo tee /etc/nix/nix.conf
-echo "trusted-binary-caches = http://hydra.nixos.org" | sudo tee -a /etc/nix/nix.conf
+sudo tee /etc/nix/nix.conf <<EOF
+binary-caches = http://cache.nixos.org http://hydra.nixos.org
+trusted-binary-caches = http://hydra.nixos.org
+build-max-jobs = 4
+EOF
 
 if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then
     echo "Not a pull request, checking evaluation"
@@ -18,7 +21,7 @@ fi
 
 echo "Installing nox"
 git clone https://github.com/madjar/nox
-pip install -e nox
+pip --quiet install -e nox
 
 echo "Reviewing PR"
 # The current HEAD is the PR merged into origin/master, so we compare