From 7f40632103a18e98ac8f42557425ba206fddf8a5 Mon Sep 17 00:00:00 2001 From: Justin Licata Date: Fri, 21 Jul 2017 17:14:54 -0500 Subject: [PATCH] fix app.json ENV vars (#10) * convert integer to string. * cache npm modules in CircleCI. * fix app.json. --- .circleci/config.yml | 20 ++++++++++++++++++++ app.json | 4 ++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3736873..271f7aa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,6 +28,9 @@ jobs: - gem-cache-{{ .Branch }}-{{ checksum "Gemfile.lock" }} - gem-cache-{{ .Branch }} - gem-cache + - npm-deps-{{ .Branch }}-{{ checksum "package.json" }} + - npm-deps-{{ checksum "package.json" }} + - npm-deps - run: name: install dependencies @@ -39,15 +42,32 @@ jobs: key: gem-cache-{{ .Branch }}-{{ checksum "Gemfile.lock" }} paths: - vendor/bundle + - save_cache: key: gem-cache-{{ .Branch }} paths: - vendor/bundle + - save_cache: key: gem-cache paths: - vendor/bundle + - save_cache: + key: npm-deps-{{ .Branch }}-{{ checksum "Gemfile.lock" }} + paths: + - .node_modules + + - save_cache: + key: npm-deps-{{ checksum "package.json" }} + paths: + - .node_modules + + - save_cache: + key: npm-deps + paths: + - .node_modules + # Database setup - run: bundle exec rails db:create - run: bundle exec rails db:schema:load diff --git a/app.json b/app.json index 0933cec..8e9a84b 100644 --- a/app.json +++ b/app.json @@ -12,10 +12,10 @@ "value": "3000" }, "RAILS_MAX_THREADS": { - "value": 5 + "value": "5" }, "WEB_CONCURRENCY": { - "value": 2 + "value": "2" } } }