From 00ea96a73eb75e7c72c8d82c38e17e0bdff40cff Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Tue, 20 Mar 2018 11:35:01 +1300 Subject: [PATCH] Can't rename GROWSTUFF_ELASTICSEARCH --- .travis.yml | 4 ++-- script/install_elasticsearch.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 838b697ae..a93298a55 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,8 +7,8 @@ cache: - tmp/cache/assets/test/sprockets env: matrix: - - ELASTICSEARCH=true RSPEC_TAG=elasticsearch COVERAGE=true - - ELASTICSEARCH=false RSPEC_TAG=~elasticsearch COVERAGE=false + - GROWSTUFF_ELASTICSEARCH=true RSPEC_TAG=elasticsearch COVERAGE=true + - GROWSTUFF_ELASTICSEARCH=false RSPEC_TAG=~elasticsearch COVERAGE=false - STATIC_CHECKS=true global: - GROWSTUFF_SITE_NAME="Growstuff (travis)" diff --git a/script/install_elasticsearch.sh b/script/install_elasticsearch.sh index 0f2f24c48..1543a71bc 100755 --- a/script/install_elasticsearch.sh +++ b/script/install_elasticsearch.sh @@ -1,6 +1,6 @@ #!/bin/bash -if [ "${ELASTICSEARCH}" = "true" ]; then +if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then set -euv sudo dpkg -r elasticsearch curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.0/elasticsearch-2.4.0.deb