From a072bea2a06372c35f39f871a71df5bcd283480e Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 5 Nov 2015 06:47:10 -0700 Subject: [PATCH 1/2] Tweak shippable config --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2b4c290..9bc18e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ cache: before_install: - mkdir -p ~/.nvm/versions - source ~/.nvm/nvm.sh && nvm install 0.12.2 - - mkdir travis-phantomjs + - mkdir -p travis-phantomjs - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs - export PATH=$PWD/travis-phantomjs:$PATH From d59aa0e3212f74bf0cb2244d6ba2e99fefc2f73a Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 5 Nov 2015 06:47:18 -0700 Subject: [PATCH 2/2] Add staging env --- config/environment.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/environment.js b/config/environment.js index 849cfed..6351cb1 100644 --- a/config/environment.js +++ b/config/environment.js @@ -39,6 +39,12 @@ module.exports = function(environment) { ENV.locationType = 'none'; } + if (environment === 'staging') { + apiURL = 'https://bactdb-test.herokuapp.com'; + ENV.APP.LOG_ACTIVE_GENERATION = false; + ENV.APP.LOG_VIEW_LOOKUPS = false; + } + if (environment === 'production') { apiURL = 'https://bactdb.herokuapp.com'; }