Check Travis-CI env
This commit is contained in:
parent
60ecc3dccf
commit
1d90f97bb7
2 changed files with 1 additions and 3 deletions
|
@ -29,8 +29,6 @@ matrix:
|
|||
- sed -i -e 's/^#database:$/database:\ postgres:\/\/szuru:dog@localhost:5432\/szuru_test/' ../config.yaml
|
||||
- sed -i -e 's/^#elasticsearch:/elasticsearch:/' ../config.yaml
|
||||
- sed -i -e 's/^# / /' ../config.yaml
|
||||
- printenv TRAVIS
|
||||
- printenv CI
|
||||
install:
|
||||
- pip install -r requirements.txt
|
||||
- pip install -r dev-requirements.txt
|
||||
|
|
|
@ -51,7 +51,7 @@ def read_config() -> Dict:
|
|||
if os.path.exists('../config.yaml'):
|
||||
with open('../config.yaml') as handle:
|
||||
ret = merge(ret, yaml.load(handle.read()))
|
||||
if os.path.exists('/.dockerenv') and os.getenv('CI', '') == 'true':
|
||||
if os.path.exists('/.dockerenv') and os.getenv('CI', '') != 'true':
|
||||
ret = merge(ret, docker_config())
|
||||
return ret
|
||||
|
||||
|
|
Reference in a new issue