diff options
| author | ashleyhull-versent <ashley.hull@versent.com.au> | 2018-12-29 17:23:07 +1100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-12-29 07:23:07 +0100 |
| commit | 29484f655596158bbbb6fcd493b28d7f990116e8 (patch) | |
| tree | ce32f140f9a4139d6b350b06247de6eb3821e9ae | |
| parent | 4725aeec9f6d91d099e93ac13b3be8df5200e5e6 (diff) | |
Replace Ruby 2.3 with 2.6 in CircleCI (#9652)
* Update config.yml * Update Gemfile * dropping ruby 2.3 2.3 EOL date: scheduled for 2019-03-31 * Updating docker containers * Update Gemfile
| -rw-r--r-- | .circleci/config.yml | 54 | ||||
| -rw-r--r-- | Gemfile | 2 |
2 files changed, 28 insertions, 28 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 1161e4076..3ecea5c9e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2 aliases: - &defaults docker: - - image: circleci/ruby:2.5.1-stretch-node + - image: circleci/ruby:2.6.0-stretch-node environment: &ruby_environment BUNDLE_APP_CONFIG: ./.bundle/ DB_HOST: localhost @@ -98,21 +98,21 @@ jobs: <<: *defaults <<: *install_steps - install-ruby2.5: + install-ruby2.6: <<: *defaults <<: *install_ruby_dependencies - install-ruby2.4: + install-ruby2.5: <<: *defaults docker: - - image: circleci/ruby:2.4.4-stretch-node + - image: circleci/ruby:2.5.3-stretch-node environment: *ruby_environment <<: *install_ruby_dependencies - install-ruby2.3: + install-ruby2.4: <<: *defaults docker: - - image: circleci/ruby:2.3.7-stretch-node + - image: circleci/ruby:2.4.5-stretch-node environment: *ruby_environment <<: *install_ruby_dependencies @@ -128,43 +128,43 @@ jobs: - ./mastodon/public/assets - ./mastodon/public/packs-test/ - test-ruby2.5: + test-ruby2.6: <<: *defaults docker: - - image: circleci/ruby:2.5.1-stretch-node + - image: circleci/ruby:2.6.0-stretch-node environment: *ruby_environment - - image: circleci/postgres:10.3-alpine + - image: circleci/postgres:10.6-alpine environment: POSTGRES_USER: root - - image: circleci/redis:4.0.9-alpine + - image: circleci/redis:5.0.3-alpine3.8 <<: *test_steps - test-ruby2.4: + test-ruby2.5: <<: *defaults docker: - - image: circleci/ruby:2.4.4-stretch-node + - image: circleci/ruby:2.5.3-stretch-node environment: *ruby_environment - - image: circleci/postgres:10.3-alpine + - image: circleci/postgres:10.6-alpine environment: POSTGRES_USER: root - - image: circleci/redis:4.0.9-alpine + - image: circleci/redis:4.0.12-alpine <<: *test_steps - test-ruby2.3: + test-ruby2.4: <<: *defaults docker: - - image: circleci/ruby:2.3.7-stretch-node + - image: circleci/ruby:2.4.5-stretch-node environment: *ruby_environment - - image: circleci/postgres:10.3-alpine + - image: circleci/postgres:10.6-alpine environment: POSTGRES_USER: root - - image: circleci/redis:4.0.9-alpine + - image: circleci/redis:4.0.12-alpine <<: *test_steps test-webui: <<: *defaults docker: - - image: circleci/node:8.11.1-stretch + - image: circleci/node:8.15.0-stretch steps: - *attach_workspace - run: ./bin/retry yarn test:jest @@ -183,20 +183,24 @@ workflows: build-and-test: jobs: - install - - install-ruby2.5: + - install-ruby2.6: requires: - install - - install-ruby2.4: + - install-ruby2.5 + - install-ruby2.5: requires: - install - - install-ruby2.5 - - install-ruby2.3: + - install-ruby2.4: requires: - install - install-ruby2.5 - build: requires: - install-ruby2.5 + - test-ruby2.6: + requires: + - install-ruby2.6 + - build - test-ruby2.5: requires: - install-ruby2.5 @@ -205,10 +209,6 @@ workflows: requires: - install-ruby2.4 - build - - test-ruby2.3: - requires: - - install-ruby2.3 - - build - test-webui: requires: - install diff --git a/Gemfile b/Gemfile index bd0ff0967..ceef9d551 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # frozen_string_literal: true source 'https://rubygems.org' -ruby '>= 2.3.0', '< 2.6.0' +ruby '>= 2.4.0', '< 2.7.0' gem 'pkg-config', '~> 1.3' |