alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

travis build: Revert silly idea

Browse source 
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?
This commit is contained in:
wmertens 2014-10-15 18:45:13 +02:00
parent 0100e79d7a
commit b084b39375
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
maintainers/scripts/travis-nox-review-pr.sh
View file

@ -5,7 +5,7 @@ export NIX_CURL_FLAGS=-sS
if [[ $1 == nix ]]; then if [[ $1 == nix ]]; then
# Install Nix # 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 source $HOME/.nix-profile/etc/profile.d/nix.sh
# Make sure we can use hydra's binary cache # Make sure we can use hydra's binary cache
@ -17,7 +17,7 @@ build-max-jobs = 4
EOF EOF
# Verify evaluation # Verify evaluation
nix-env -f. -qa --json >/dev/null nix-env -f. -qa --json
elif [[ $1 == nox ]]; then elif [[ $1 == nox ]]; then
git clone -q https://github.com/madjar/nox git clone -q https://github.com/madjar/nox
pip --quiet install -e nox pip --quiet install -e nox
@ -30,10 +30,7 @@ elif [[ $1 == build ]]; then
else else
# The current HEAD is the PR merged into origin/master, so we compare # The current HEAD is the PR merged into origin/master, so we compare
# against origin/master # against origin/master
# However, since we want to optimize build time, we compare against nox-review wip --against origin/master
# the last commit Hydra compiled
built_rev=$(ls -l $HOME/.nix-defexpr/channels/nixpkgs | sed 's/.*\.\(.*\)\/nixpkgs/\1/')
nox-review wip --against $built_rev
fi fi
else else
echo "$0: Unknown option $1" >&2 echo "$0: Unknown option $1" >&2