.travis.yml: Remove GitHub merge commit workaround

coala · Jul 9, 2018 · b3e7ac2 · b3e7ac2
1 parent 44d4572
commit b3e7ac2
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,11 +9,8 @@ cache: bundler
 # the `install` step will run `bundle install` by default.
 script:
   - .ci/build.sh
-  # https://github.com/coala/coala-bears/issues/1037
-  - >
-    if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then
-      sed -i.bak '/bears = GitCommitBear/d' .coafile
-    fi
+  - curl -fsSL -o coala-bears.zip $BEARS_ZIP_URL/master
+  - pip install coala-bears.zip[alldeps] --pre -U
   - docker run -v=$(pwd):/app --workdir=/app coala/base coala --ci
 
 notifications:
@@ -24,6 +21,7 @@ notifications:
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true  # Speeds installation of html-proofer
+    - BEARS_ZIP_URL=https://codeload.github.com/coala/coala-bears/zip
 
 # Route your build to the container-based infrastructure for a faster build
 sudo: false