diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-19 19:55:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-19 19:55:02 +0100 |
| commit | 3ba7c85ec9bd5dcf75b30b00ed634b3b31a029af (patch) | |
| tree | 6e0cd84a36280b314df2e1654e42f3dc05ee56e1 /.circleci | |
| parent | f2b376e9d82577dc630757a2b927d02f8bfcf4b0 (diff) | |
| parent | 189cf652e6b3c6ee1d303282ca93823965f89f24 (diff) | |
Merge pull request #1634 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to '.circleci')
| -rw-r--r-- | .circleci/config.yml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 968de1eb2..e3e4f83d9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -23,7 +23,7 @@ executors: environment: POSTGRES_USER: root POSTGRES_HOST_AUTH_METHOD: trust - - image: circleci/redis:5-alpine + - image: circleci/redis:6-alpine commands: install-system-dependencies: @@ -45,7 +45,7 @@ commands: bundle config without 'development production' name: Set bundler settings - ruby/install-deps: - bundler-version: '2.2.29' + bundler-version: '2.2.31' key: ruby<< parameters.ruby-version >>-gems-v1 wait-db: steps: @@ -56,14 +56,14 @@ commands: jobs: build: docker: - - image: cimg/ruby:2.7-node + - image: cimg/ruby:3.0-node environment: RAILS_ENV: test steps: - checkout - install-system-dependencies - install-ruby-dependencies: - ruby-version: '2.7' + ruby-version: '3.0' - node/install-packages: cache-version: v1 pkg-manager: yarn @@ -111,12 +111,12 @@ jobs: test-migrations: executor: name: default - ruby-version: '2.7' + ruby-version: '3.0' steps: - checkout - install-system-dependencies - install-ruby-dependencies: - ruby-version: '2.7' + ruby-version: '3.0' - wait-db - run: command: ./bin/rails db:create |