diff options
author | wmertens <Wout.Mertens@gmail.com> | 2014-10-15 18:45:13 +0200 |
---|---|---|
committer | wmertens <Wout.Mertens@gmail.com> | 2014-10-15 18:45:13 +0200 |
commit | b084b3937580857d0f47e2c44a1c844c58c527c7 (patch) | |
tree | 0032418769271c2d6b341661d23e7842792b5d68 /maintainers | |
parent | 0100e79d7a03694496a9c712235dce14e695c47e (diff) | |
download | nixlib-b084b3937580857d0f47e2c44a1c844c58c527c7.tar nixlib-b084b3937580857d0f47e2c44a1c844c58c527c7.tar.gz nixlib-b084b3937580857d0f47e2c44a1c844c58c527c7.tar.bz2 nixlib-b084b3937580857d0f47e2c44a1c844c58c527c7.tar.lz nixlib-b084b3937580857d0f47e2c44a1c844c58c527c7.tar.xz nixlib-b084b3937580857d0f47e2c44a1c844c58c527c7.tar.zst nixlib-b084b3937580857d0f47e2c44a1c844c58c527c7.zip |
travis build: Revert silly idea
nox-review should review against master, it's travis that should check out a hydra-available master commit to set the PR on. Perhaps we could rebase the current HEAD on the hydra-built commitish instead?
Diffstat (limited to 'maintainers')
-rwxr-xr-x | maintainers/scripts/travis-nox-review-pr.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index 0835dc92b7bb..272961fb752e 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -5,7 +5,7 @@ export NIX_CURL_FLAGS=-sS if [[ $1 == nix ]]; then # Install Nix - bash <(curl -sS https://nixos.org/nix/install) >/dev/null 2>&1 + bash <(curl -sS https://nixos.org/nix/install) source $HOME/.nix-profile/etc/profile.d/nix.sh # Make sure we can use hydra's binary cache @@ -17,7 +17,7 @@ build-max-jobs = 4 EOF # Verify evaluation - nix-env -f. -qa --json >/dev/null + nix-env -f. -qa --json elif [[ $1 == nox ]]; then git clone -q https://github.com/madjar/nox pip --quiet install -e nox @@ -30,10 +30,7 @@ elif [[ $1 == build ]]; then else # The current HEAD is the PR merged into origin/master, so we compare # against origin/master - # However, since we want to optimize build time, we compare against - # the last commit Hydra compiled - built_rev=$(ls -l $HOME/.nix-defexpr/channels/nixpkgs | sed 's/.*\.\(.*\)\/nixpkgs/\1/') - nox-review wip --against $built_rev + nox-review wip --against origin/master fi else echo "$0: Unknown option $1" >&2 |