From 9120289c79b1f73e0aca634092b354c23184996f Mon Sep 17 00:00:00 2001 From: Robert Kowalski Date: Mon, 11 Apr 2016 14:01:42 +0200 Subject: [PATCH 1/4] test if node 5 fixes flakyness --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index db8d84844..86807a114 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ before_install: - sudo apt-get -y install libicu-dev libmozjs-dev pkg-config help2man libcurl4-openssl-dev - sudo apt-get -y install libtool automake autoconf autoconf-archive - sudo apt-get -y install haproxy - - nvm install 4 && nvm use 4 + - nvm install 5 && nvm use 5 - cd .. - git clone --depth=1 https://github.com/apache/couchdb From 56c926b2e49ccfb4c85058563e6b36eef388afe7 Mon Sep 17 00:00:00 2001 From: Robert Kowalski Date: Mon, 11 Apr 2016 14:07:35 +0200 Subject: [PATCH 2/4] test --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 86807a114..9da3da8f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,6 +19,7 @@ before_install: - cd .. - git clone --depth=1 https://github.com/apache/couchdb - cd couchdb + - git reset --hard 596d3a4e7aa13e31e415b4dcd7cfc4cd1f1d8f9d - ./configure --disable-docs - make - ./dev/run --admin=tester:testerpass & From 9258c13f01e4a292e3c688ccf2be09b10b46fdaa Mon Sep 17 00:00:00 2001 From: Robert Kowalski Date: Mon, 11 Apr 2016 15:00:31 +0200 Subject: [PATCH 3/4] meh --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9da3da8f7..d1d9bac8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,9 +17,9 @@ before_install: - nvm install 5 && nvm use 5 - cd .. - - git clone --depth=1 https://github.com/apache/couchdb + - git clone https://github.com/apache/couchdb - cd couchdb - - git reset --hard 596d3a4e7aa13e31e415b4dcd7cfc4cd1f1d8f9d + - git reset --hard 3619c80c3e45994304fc88f1c281bd9f50e7366d - ./configure --disable-docs - make - ./dev/run --admin=tester:testerpass & @@ -42,3 +42,4 @@ cache: apt git: depth: 1 + depth: 1 From b810cfab6513a32ee2cbe9695afb7b9b05354804 Mon Sep 17 00:00:00 2001 From: Robert Kowalski Date: Mon, 11 Apr 2016 15:30:59 +0200 Subject: [PATCH 4/4] GNAR --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d1d9bac8e..4e1ca2169 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,4 +42,3 @@ cache: apt git: depth: 1 - depth: 1