Merge pull request #2971 from ethomson/revert_fastfail

Revert "fastfail" from the mingw PR

4 files changed, 2 insertions, 16 deletions

diff --git a/appveyor.yml b/appveyor.yml
index c6a9f1d71..cf9564b6d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -26,10 +26,6 @@ cache:
 - x86_64-4.9.2-release-win32-seh-rt_v3-rev1.7z
 build_script:
 - ps: |
-    if ($env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:APPVEYOR_BUILD_NUMBER -ne ((Invoke-RestMethod `
-      https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
-      Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
-      throw "There are newer queued builds for this pull request, failing early." }
     mkdir build
     cd build
     if ($env:GENERATOR -ne "MSYS Makefiles") {
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