.circleci/config.yml.erb in roo_on_rails-2.0.0.pre.pre.2 vs .circleci/config.yml.erb in roo_on_rails-2.1.0

- old
+ new

@@ -8,31 +8,43 @@ # Unsettting these variables restores the default behaviour:- # * BUNDLE_APP_CONFIG # * GEM_HOME # * BUNDLE_PATH # * BUNDLE_BIN - +common_ruby_environment: &common_ruby_environment + environment: + RAILS_ENV: test + PGHOST: 127.0.0.1 + PGUSER: postgres + POSTGRES_HOST_AUTH_METHOD: "trust" +common_pg_environment_vars: &common_pg_environment_vars + POSTGRES_USER: postgres + POSTGRES_DB: ror_testapp_test + POSTGRES_HOST_AUTH_METHOD: "trust" <% builds = [ ['2.4.6', 'rails_4'], ['2.4.6', 'rails_5'], ['2.4.6', 'rails_5_1'], ['2.4.6', 'rails_5_2'], ['2.5.5', 'rails_4'], ['2.5.5', 'rails_5'], ['2.5.5', 'rails_5_1'], - ['2.5.5', 'rails_5_2'] + ['2.5.5', 'rails_5_2'], + ['2.6.5', 'rails_6'] ] %> version: 2 jobs: <% builds.each do |ruby,variant| %> build_<%= ruby %>_<%= variant %>: docker: - image: ruby:<%= ruby %>-alpine + <<: *common_ruby_environment - image: postgres:9.6-alpine environment: PGDATA: /dev/shm/pgdata + <<: *common_pg_environment_vars - image: redis:4-alpine steps: - checkout - run: