luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-25 16:24:00 +00:00
Code Issues Projects Releases Wiki Activity

Upgrade CircleCI testing to Ruby 2.4-2.7 (#12800)

Browse source 
* Update config.yml

* Update Gemfile
This commit is contained in:
Shlee 2020-01-10 12:34:25 +08:00 committed by Eugen Rochko
parent 139f7646a7
commit e326b0dda1
2 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
.circleci/config.yml
View file

@ -3,7 +3,7 @@ version: 2
aliases: aliases:
- &defaults - &defaults
docker: docker:
- image: circleci/ruby:2.6-buster-node - image: circleci/ruby:2.7-buster-node
environment: &ruby_environment environment: &ruby_environment
BUNDLE_APP_CONFIG: ./.bundle/ BUNDLE_APP_CONFIG: ./.bundle/
DB_HOST: localhost DB_HOST: localhost
@ -98,8 +98,15 @@ jobs:
<<: *defaults <<: *defaults
<<: *install_steps <<: *install_steps
install-ruby2.7:
<<: *defaults
<<: *install_ruby_dependencies
install-ruby2.6: install-ruby2.6:
<<: *defaults <<: *defaults
docker:
- image: circleci/ruby:2.6-buster-node
environment: *ruby_environment
<<: *install_ruby_dependencies <<: *install_ruby_dependencies
install-ruby2.5: install-ruby2.5:
@ -128,6 +135,17 @@ jobs:
- ./mastodon/public/assets - ./mastodon/public/assets
- ./mastodon/public/packs-test/ - ./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: test-ruby2.6:
<<: *defaults <<: *defaults
docker: docker:
@ -184,20 +202,28 @@ workflows:
build-and-test: build-and-test:
jobs: jobs:
- install - install
- install-ruby2.7:
requires:
- install
- install-ruby2.6: - install-ruby2.6:
requires: requires:
- install - install
- install-ruby2.7
- install-ruby2.5: - install-ruby2.5:
requires: requires:
- install - install
- install-ruby2.6 - install-ruby2.7
- install-ruby2.4: - install-ruby2.4:
requires: requires:
- install - install
- install-ruby2.6 - install-ruby2.7
- build: - build:
requires: requires:
- install-ruby2.6 - install-ruby2.7
- test-ruby2.7:
requires:
- install-ruby2.7
- build
- test-ruby2.6: - test-ruby2.6:
requires: requires:
- install-ruby2.6 - install-ruby2.6
@ -215,4 +241,4 @@ workflows:
- install - install
- check-i18n: - check-i18n:
requires: requires:
- install-ruby2.6 - install-ruby2.7

5
Gemfile
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '>= 2.4.0', '< 2.7.0' ruby '>= 2.4.0', '< 3.0.0'
gem 'pkg-config', '~> 1.4' gem 'pkg-config', '~> 1.4'
@ -10,6 +10,9 @@ gem 'rails', '~> 5.2.4'
gem 'sprockets', '~> 3.7.2' gem 'sprockets', '~> 3.7.2'
gem 'thor', '~> 0.20' gem 'thor', '~> 0.20'
gem 'thwait', '~> 0.1.0'
gem 'e2mmap', '~> 0.1.0'
gem 'hamlit-rails', '~> 0.2' gem 'hamlit-rails', '~> 0.2'
gem 'pg', '~> 1.2' gem 'pg', '~> 1.2'
gem 'makara', '~> 0.4' gem 'makara', '~> 0.4'