Ruby 3.0.2 Upgrade (#16982)
* Update .ruby-version * Update Gemfile * Update Gemfile.lock * Update Dockerfile * Update check-i18n.yml * Update config.yml * Update config.yml
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								.github/workflows/check-i18n.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/check-i18n.yml
									
									
									
									
										vendored
									
									
								
							@@ -22,7 +22,7 @@ jobs:
 | 
			
		||||
    - name: Set up Ruby
 | 
			
		||||
      uses: ruby/setup-ruby@v1
 | 
			
		||||
      with:
 | 
			
		||||
        ruby-version: '2.7'
 | 
			
		||||
        ruby-version: '3.0'
 | 
			
		||||
        bundler-cache: true
 | 
			
		||||
    - name: Check locale file normalization
 | 
			
		||||
      run: bundle exec i18n-tasks check-normalized
 | 
			
		||||
 
 | 
			
		||||
@@ -1 +1 @@
 | 
			
		||||
2.7.4
 | 
			
		||||
3.0.2
 | 
			
		||||
 
 | 
			
		||||
@@ -25,8 +25,8 @@ RUN ARCH= && \
 | 
			
		||||
	rm node-v$NODE_VER-linux-$ARCH.tar.gz && \
 | 
			
		||||
	mv node-v$NODE_VER-linux-$ARCH /opt/node
 | 
			
		||||
 | 
			
		||||
# Install Ruby
 | 
			
		||||
ENV RUBY_VER="2.7.4"
 | 
			
		||||
# Install Ruby 3.0
 | 
			
		||||
ENV RUBY_VER="3.0.2"
 | 
			
		||||
RUN apt-get update && \
 | 
			
		||||
  apt-get install -y --no-install-recommends build-essential \
 | 
			
		||||
    bison libyaml-dev libgdbm-dev libreadline-dev libjemalloc-dev \
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										1
									
								
								Gemfile
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								Gemfile
									
									
									
									
									
								
							@@ -4,6 +4,7 @@ source 'https://rubygems.org'
 | 
			
		||||
ruby '>= 2.5.0', '< 3.1.0'
 | 
			
		||||
 | 
			
		||||
gem 'pkg-config', '~> 1.4'
 | 
			
		||||
gem 'rexml', '~> 3.2'
 | 
			
		||||
 | 
			
		||||
gem 'puma', '~> 5.5'
 | 
			
		||||
gem 'rails', '~> 6.1.4'
 | 
			
		||||
 
 | 
			
		||||
@@ -758,6 +758,7 @@ DEPENDENCIES
 | 
			
		||||
  rdf-normalize (~> 0.4)
 | 
			
		||||
  redis (~> 4.5)
 | 
			
		||||
  redis-namespace (~> 1.8)
 | 
			
		||||
  rexml (~> 3.2)
 | 
			
		||||
  rqrcode (~> 2.1)
 | 
			
		||||
  rspec-rails (~> 5.0)
 | 
			
		||||
  rspec-sidekiq (~> 3.1)
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user