Add support Ruby v2.5.0 (#6097)
This commit is contained in:
		
				
					committed by
					
						
						Eugen Rochko
					
				
			
			
				
	
			
			
			
						parent
						
							b1e03197fa
						
					
				
				
					commit
					7233ac07d2
				
			@@ -1 +1 @@
 | 
			
		||||
2.4.2
 | 
			
		||||
2.5.0
 | 
			
		||||
 
 | 
			
		||||
@@ -40,20 +40,20 @@ addons:
 | 
			
		||||
    - yarn
 | 
			
		||||
 | 
			
		||||
rvm:
 | 
			
		||||
  - 2.3.4
 | 
			
		||||
  - 2.4.2
 | 
			
		||||
  - 2.5.0
 | 
			
		||||
 | 
			
		||||
services:
 | 
			
		||||
  - redis-server
 | 
			
		||||
 | 
			
		||||
install:
 | 
			
		||||
  - gem update --system
 | 
			
		||||
  - nvm install
 | 
			
		||||
  - bundle install --path=vendor/bundle --without development production --retry=3 --jobs=16
 | 
			
		||||
  - yarn install
 | 
			
		||||
 | 
			
		||||
before_script:
 | 
			
		||||
  - bundle exec rake parallel:create parallel:load_schema parallel:prepare
 | 
			
		||||
  - bundle exec rails assets:precompile
 | 
			
		||||
  - ./bin/rails parallel:create parallel:load_schema parallel:prepare assets:precompile
 | 
			
		||||
  - ln -s /usr/bin/x86_64-linux-gnu-g++-6 "$HOME/g++"
 | 
			
		||||
 | 
			
		||||
script:
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
FROM ruby:2.4.2-alpine3.6
 | 
			
		||||
FROM ruby:2.5.0-alpine3.7
 | 
			
		||||
 | 
			
		||||
LABEL maintainer="https://github.com/tootsuite/mastodon" \
 | 
			
		||||
      description="A GNU Social-compatible microblogging server"
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										4
									
								
								Gemfile
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								Gemfile
									
									
									
									
									
								
							@@ -1,7 +1,7 @@
 | 
			
		||||
# frozen_string_literal: true
 | 
			
		||||
 | 
			
		||||
source 'https://rubygems.org'
 | 
			
		||||
ruby '>= 2.3.0', '< 2.5.0'
 | 
			
		||||
ruby '>= 2.3.0', '< 2.6.0'
 | 
			
		||||
 | 
			
		||||
gem 'pkg-config', '~> 1.2'
 | 
			
		||||
 | 
			
		||||
@@ -28,7 +28,7 @@ gem 'browser'
 | 
			
		||||
gem 'charlock_holmes', '~> 0.7.5'
 | 
			
		||||
gem 'iso-639'
 | 
			
		||||
gem 'cld3', '~> 3.2.0'
 | 
			
		||||
gem 'devise', '~> 4.3'
 | 
			
		||||
gem 'devise', '~> 4.4'
 | 
			
		||||
gem 'devise-two-factor', '~> 3.0'
 | 
			
		||||
gem 'doorkeeper', '~> 4.2'
 | 
			
		||||
gem 'fast_blank', '~> 1.0'
 | 
			
		||||
 
 | 
			
		||||
@@ -110,7 +110,7 @@ GEM
 | 
			
		||||
      activesupport
 | 
			
		||||
    charlock_holmes (0.7.5)
 | 
			
		||||
    chunky_png (1.3.8)
 | 
			
		||||
    cld3 (3.2.1)
 | 
			
		||||
    cld3 (3.2.2)
 | 
			
		||||
      ffi (>= 1.1.0, < 1.10.0)
 | 
			
		||||
    climate_control (0.2.0)
 | 
			
		||||
    cocaine (0.5.8)
 | 
			
		||||
@@ -125,7 +125,7 @@ GEM
 | 
			
		||||
    css_parser (1.6.0)
 | 
			
		||||
      addressable
 | 
			
		||||
    debug_inspector (0.0.3)
 | 
			
		||||
    devise (4.3.0)
 | 
			
		||||
    devise (4.4.0)
 | 
			
		||||
      bcrypt (~> 3.0)
 | 
			
		||||
      orm_adapter (~> 0.1)
 | 
			
		||||
      railties (>= 4.1.0, < 5.2)
 | 
			
		||||
@@ -568,7 +568,7 @@ DEPENDENCIES
 | 
			
		||||
  charlock_holmes (~> 0.7.5)
 | 
			
		||||
  cld3 (~> 3.2.0)
 | 
			
		||||
  climate_control (~> 0.2)
 | 
			
		||||
  devise (~> 4.3)
 | 
			
		||||
  devise (~> 4.4)
 | 
			
		||||
  devise-two-factor (~> 3.0)
 | 
			
		||||
  doorkeeper (~> 4.2)
 | 
			
		||||
  dotenv-rails (~> 2.2)
 | 
			
		||||
@@ -649,7 +649,7 @@ DEPENDENCIES
 | 
			
		||||
  webpush
 | 
			
		||||
 | 
			
		||||
RUBY VERSION
 | 
			
		||||
   ruby 2.4.2p198
 | 
			
		||||
   ruby 2.5.0p0
 | 
			
		||||
 | 
			
		||||
BUNDLED WITH
 | 
			
		||||
   1.16.1
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user