diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-06-22 10:57:36 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-06-22 10:57:36 -0700 |
| commit | 282d03befa69b7b60a08a40200ad8218f3eadfa7 (patch) | |
| tree | 59885694c8827979da3d9b29eec74205cd49e8a4 /maintainers/scripts | |
| parent | ad779acd3be0a29bcda55f760eee6de35cfedef5 (diff) | |
| parent | 22172b8e43dfac3486d108a085b5911d7e2d8c5a (diff) | |
| download | nixlib-282d03befa69b7b60a08a40200ad8218f3eadfa7.tar nixlib-282d03befa69b7b60a08a40200ad8218f3eadfa7.tar.gz nixlib-282d03befa69b7b60a08a40200ad8218f3eadfa7.tar.bz2 nixlib-282d03befa69b7b60a08a40200ad8218f3eadfa7.tar.lz nixlib-282d03befa69b7b60a08a40200ad8218f3eadfa7.tar.xz nixlib-282d03befa69b7b60a08a40200ad8218f3eadfa7.tar.zst nixlib-282d03befa69b7b60a08a40200ad8218f3eadfa7.zip | |
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'maintainers/scripts')
| -rwxr-xr-x | maintainers/scripts/travis-nox-review-pr.sh | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh index 3c3f9151d837..545499557479 100755 --- a/maintainers/scripts/travis-nox-review-pr.sh +++ b/maintainers/scripts/travis-nox-review-pr.sh @@ -31,7 +31,15 @@ elif [[ $1 == build ]]; then echo "=== Not a pull request" else echo "=== Checking PR" - nox-review pr ${TRAVIS_PULL_REQUEST} + + if ! nox-review pr ${TRAVIS_PULL_REQUEST}; then + if sudo dmesg | egrep 'Out of memory|Killed process' > /tmp/oom-log; then + echo "=== The build failed due to running out of memory:" + cat /tmp/oom-log + echo "=== Please disregard the result of this Travis build." + fi + exit 1 + fi fi # echo "=== Checking tarball creation" # nix-build pkgs/top-level/release.nix -A tarball |