restore dev env settings

AndersenLab · Sep 13, 2021 · 4b4a7c2 · 4b4a7c2
1 parent 0fe0a15
commit 4b4a7c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,10 @@ env:
 install:
 - openssl aes-256-cbc -K $encrypted_86f5a1ab1ccf_key -iv $encrypted_86f5a1ab1ccf_iv -in env_config.zip.enc -out env_config.zip -d
 - unzip -qo env_config.zip
-- export VERSION_NUM=1-7-0g
-- export APP_CONFIG=master
+- export VERSION_NUM=9-9-9-9
+- export APP_CONFIG=development
 - export CLOUD_CONFIG=1
+- if [ "${TRAVIS_BRANCH}" != "master" ]; then export APP_CONFIG=development; fi;
 - export GAE_VERSION=${APP_CONFIG}-${VERSION_NUM}
 - export GOOGLE_APPLICATION_CREDENTIALS=env_config/client-secret.json
 - export GOOGLE_CLOUD_BUCKET=${GOOGLE_CLOUD_BUCKET}

diff --git a/app.yaml b/app.yaml
@@ -2,7 +2,7 @@ beta_settings:
   cloud_sql_instances: andersen-lab:us-central1:cendr
 
 runtime: custom
-service: default
+service: dev
 env: flex
 entrypoint: gunicorn -b :$PORT main:app --ssl-version TLSv1_2
 runtime_config: