thermokarst/hymenobacterdotinfo
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into clostridium

Browse source 
* master:
  Add staging env
  Tweak shippable config
This commit is contained in:
Matthew Dillon 2015-11-05 09:38:50 -07:00
commit 0a039e57c4
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -10,7 +10,7 @@ cache:
before_install: before_install:
- mkdir -p ~/.nvm/versions - mkdir -p ~/.nvm/versions
- source ~/.nvm/nvm.sh && nvm install 0.12.2 - 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 - 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 - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
- export PATH=$PWD/travis-phantomjs:$PATH - export PATH=$PWD/travis-phantomjs:$PATH

6
config/environment.js
View file

@ -39,6 +39,12 @@ module.exports = function(environment) {
ENV.locationType = 'none'; 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') { if (environment === 'production') {
apiURL = 'https://bactdb.herokuapp.com'; apiURL = 'https://bactdb.herokuapp.com';
} }