diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2015-03-10 16:08:34 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-03-10 16:08:34 -0400 |
| commit | 3e329861145bcd106023e73a3098f24b79e54c16 (patch) | |
| tree | e2ea624a08ddf8b1c65197bddeecd56639994ca8 | |
| parent | d7c81945b0619ac707ebd0fb007bf63c3bef3037 (diff) | |
| download | libgit2-3e329861145bcd106023e73a3098f24b79e54c16.tar.gz | |
Revert "Implement fail-fast for Travis as well"
This reverts commit ba6c53b91b1d9c9dc49b7c0d8e8efbd9842c31dc.
| -rwxr-xr-x | script/cibuild.sh | 10 | ||||
| -rwxr-xr-x | script/install-deps-linux.sh | 2 | ||||
| -rwxr-xr-x | script/install-deps-osx.sh | 2 |
3 files changed, 2 insertions, 12 deletions
diff --git a/script/cibuild.sh b/script/cibuild.sh index 82cf72553..8983dcce0 100755 --- a/script/cibuild.sh +++ b/script/cibuild.sh @@ -1,15 +1,5 @@ #!/bin/sh -# Fail fast for superseded builds to PR's -if ! [ "$TRAVIS_PULL_REQUEST" = "false" ]; then - if ! [ \"$TRAVIS_BUILD_NUMBER\" = $(curl -H "Accept: application/vnd.travis-ci.2+json" \ - https://api.travis-ci.org/repos/libgit2/libgit2/builds?event_type=pull_request | \ - jq ".builds | map(select(.pull_request_number == $TRAVIS_PULL_REQUEST))[0].number") ]; then - echo "There are newer queued builds for this pull request, failing early." - exit 1 - fi -fi - if [ -n "$COVERITY" ]; then ./script/coverity.sh; diff --git a/script/install-deps-linux.sh b/script/install-deps-linux.sh index 3eb57ce1a..347922b89 100755 --- a/script/install-deps-linux.sh +++ b/script/install-deps-linux.sh @@ -3,4 +3,4 @@ set -x sudo apt-get -qq update && -sudo apt-get -qq install cmake libssh2-1-dev openssh-client openssh-server jq +sudo apt-get -qq install cmake libssh2-1-dev openssh-client openssh-server diff --git a/script/install-deps-osx.sh b/script/install-deps-osx.sh index ad6a7b41d..c2e0162d8 100755 --- a/script/install-deps-osx.sh +++ b/script/install-deps-osx.sh @@ -2,4 +2,4 @@ set -x -brew install libssh2 cmake jq +brew install libssh2 cmake |