about summary refs log tree commit diff
path: root/.circleci/config.yml
diff options
context:
space:
mode:
authorShlee <github@shl.ee>2020-01-10 12:34:25 +0800
committerEugen Rochko <eugen@zeonfederated.com>2020-01-10 05:34:25 +0100
commite326b0dda1cd9b85519c185fbed624ad0eb4d91d (patch)
tree42f1297d320079b0f085a56f6efa560e1e55f235 /.circleci/config.yml
parent139f7646a7e3af491d5d6c6a99e82d46f9551400 (diff)
Upgrade CircleCI testing to Ruby 2.4-2.7 (#12800)
* Update config.yml

* Update Gemfile
Diffstat (limited to '.circleci/config.yml')
-rw-r--r--.circleci/config.yml36
1 files changed, 31 insertions, 5 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 83a2088d7..6922d033a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,7 +3,7 @@ version: 2
 aliases:
   - &defaults
     docker:
-      - image: circleci/ruby:2.6-buster-node
+      - image: circleci/ruby:2.7-buster-node
         environment: &ruby_environment
           BUNDLE_APP_CONFIG: ./.bundle/
           DB_HOST: localhost
@@ -98,8 +98,15 @@ jobs:
     <<: *defaults
     <<: *install_steps
 
+  install-ruby2.7:
+    <<: *defaults
+    <<: *install_ruby_dependencies
+
   install-ruby2.6:
     <<: *defaults
+    docker:
+      - image: circleci/ruby:2.6-buster-node
+        environment: *ruby_environment
     <<: *install_ruby_dependencies
 
   install-ruby2.5:
@@ -128,6 +135,17 @@ jobs:
               - ./mastodon/public/assets
               - ./mastodon/public/packs-test/
 
+  test-ruby2.7:
+    <<: *defaults
+    docker:
+      - image: circleci/ruby:2.7-buster-node
+        environment: *ruby_environment
+      - image: circleci/postgres:10.6-alpine
+        environment:
+          POSTGRES_USER: root
+      - image: circleci/redis:5-alpine
+    <<: *test_steps
+
   test-ruby2.6:
     <<: *defaults
     docker:
@@ -184,20 +202,28 @@ workflows:
   build-and-test:
     jobs:
       - install
+      - install-ruby2.7:
+          requires:
+            - install
       - install-ruby2.6:
           requires:
             - install
+            - install-ruby2.7
       - install-ruby2.5:
           requires:
             - install
-            - install-ruby2.6
+            - install-ruby2.7
       - install-ruby2.4:
           requires:
             - install
-            - install-ruby2.6
+            - install-ruby2.7
       - build:
           requires:
-            - install-ruby2.6
+            - install-ruby2.7
+      - test-ruby2.7:
+          requires:
+            - install-ruby2.7
+            - build
       - test-ruby2.6:
           requires:
             - install-ruby2.6
@@ -215,4 +241,4 @@ workflows:
             - install
       - check-i18n:
           requires:
-            - install-ruby2.6
+            - install-ruby2.7