diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-04-04 21:47:37 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-04-04 21:47:37 +0200 |
| commit | 8fef96cbf507324138c2d59b00ffc82ef4fac11a (patch) | |
| tree | 5543993f6692b48b10c7943e6a8bab2f240ca1f7 /.circleci | |
| parent | 5c5317041f17375666bfaf4788f0adf71804b47d (diff) | |
| parent | d3ff06a3205130fa10ffc5d736e8206a9725b5df (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index a343fc654..dd943e327 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -139,9 +139,10 @@ jobs: docker: - image: circleci/ruby:2.7-buster-node environment: *ruby_environment - - image: circleci/postgres:10.6-alpine + - image: circleci/postgres:12.2 environment: POSTGRES_USER: root + POSTGRES_HOST_AUTH_METHOD: trust - image: circleci/redis:5-alpine steps: - *attach_workspace @@ -158,9 +159,10 @@ jobs: docker: - image: circleci/ruby:2.7-buster-node environment: *ruby_environment - - image: circleci/postgres:10.6-alpine + - image: circleci/postgres:12.2 environment: POSTGRES_USER: root + POSTGRES_HOST_AUTH_METHOD: trust - image: circleci/redis:5-alpine <<: *test_steps @@ -169,9 +171,10 @@ jobs: docker: - image: circleci/ruby:2.6-buster-node environment: *ruby_environment - - image: circleci/postgres:10.6-alpine + - image: circleci/postgres:12.2 environment: POSTGRES_USER: root + POSTGRES_HOST_AUTH_METHOD: trust - image: circleci/redis:5-alpine <<: *test_steps @@ -180,9 +183,10 @@ jobs: docker: - image: circleci/ruby:2.5-buster-node environment: *ruby_environment - - image: circleci/postgres:10.6-alpine + - image: circleci/postgres:12.2 environment: POSTGRES_USER: root + POSTGRES_HOST_AUTH_METHOD: trust - image: circleci/redis:5-alpine <<: *test_steps |