From 9b6a1b9fce080bfea827de24daa2dfd33ac8c37a Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@brenda.nz>
Date: Sat, 15 Aug 2020 10:14:41 +1200
Subject: [PATCH] Removed contributor check from travis

---
 .travis.yml | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cc605c096..dd875c966 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,16 +9,15 @@ cache:
   directories:
     - tmp/cache/assets/test/sprockets
 addons:
-  postgresql: "9.4"
+  postgresql: "9.4" # Matches production
   code_climate:
     repo_token:
       secure: "PfhLGBKRgNqhKuYCJsK+VPhdAzcgWFGeeOyxC/eS8gtlvIISVdgyZE+r30uIei0DFI6zEiN62eW4d+xtT4j7/e2ZcAcx7U52mza/SnQNuu3nCGQDJB8VOvV5NbnwXfi8vfr4e889Mt7k3ocd2c4gqB4UtRqrzhygj7HN+B/GfEk="
 env:
-  matrix:
-    - ELASTIC_SEARCH_VERSION="7.5.1-amd64" COVERAGE=true RAILS_ENV=test # Future target (production needs upgrading)
-    - STATIC_CHECKS=true
   global:
     - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
+    - ELASTIC_SEARCH_VERSION="7.5.1-amd64"
+    - COVERAGE=true
     - GROWSTUFF_EMAIL="noreply@test.growstuff.org"g
     - GROWSTUFF_SITE_NAME="Growstuff (travis)"
     - RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx']
@@ -33,23 +32,16 @@ before_install:
   - ./script/check_elasticsearch.sh
 script:
   - >
-    if [ "${STATIC_CHECKS}" = "true" ]; then
-      ./script/check_static.rb
-    else
-      bundle exec rails db:create db:migrate;
-      RAILS_ENV=dev bundle exec rails runner "ActiveMedian.create_function";
-      RAILS_ENV=test bundle exec rails runner "ActiveMedian.create_function";
-      bundle exec rails assets:precompile;
-      bundle exec rails search:reindex;
-      bundle exec rspec spec;
-      # npx percy exec -- bundle exec rspec spec # <- run this to send screen shots to percy
-    fi;
+    bundle exec rails db:create db:migrate;
+    RAILS_ENV=dev bundle exec rails runner "ActiveMedian.create_function";
+    RAILS_ENV=test bundle exec rails runner "ActiveMedian.create_function";
+    bundle exec rails assets:precompile;
+    bundle exec rails search:reindex;
+    bundle exec rspec spec;
 after_script:
   - >
-    if [ "${COVERAGE}" = "true" ]; then
-      gem install codeclimate-test-reporter
-      codeclimate-test-reporter
-    fi
+    gem install codeclimate-test-reporter
+    codeclimate-test-reporter
 before_deploy:
   - bundle exec script/heroku_maintenance.rb on
 deploy: