fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-18 07:38:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ruby 3.0.2 Upgrade (#16982)

Browse source 
* 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:
Shlee 2021-11-19 07:59:57 +11:00 committed by GitHub
parent bc348dbe94
commit c242c1d87a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.circleci/config.yml
View file

@ -23,7 +23,7 @@ executors:
environment: environment:
POSTGRES_USER: root POSTGRES_USER: root
POSTGRES_HOST_AUTH_METHOD: trust POSTGRES_HOST_AUTH_METHOD: trust
- image: circleci/redis:5-alpine - image: circleci/redis:6-alpine
commands: commands:
install-system-dependencies: install-system-dependencies:
@ -45,7 +45,7 @@ commands:
bundle config without 'development production' bundle config without 'development production'
name: Set bundler settings name: Set bundler settings
- ruby/install-deps: - ruby/install-deps:
bundler-version: '2.2.29' bundler-version: '2.2.31'
key: ruby<< parameters.ruby-version >>-gems-v1 key: ruby<< parameters.ruby-version >>-gems-v1
wait-db: wait-db:
steps: steps:
@ -56,14 +56,14 @@ commands:
jobs: jobs:
build: build:
docker: docker:
- image: cimg/ruby:2.7-node - image: cimg/ruby:3.0-node
environment: environment:
RAILS_ENV: test RAILS_ENV: test
steps: steps:
- checkout - checkout
- install-system-dependencies - install-system-dependencies
- install-ruby-dependencies: - install-ruby-dependencies:
ruby-version: '2.7' ruby-version: '3.0'
- node/install-packages: - node/install-packages:
cache-version: v1 cache-version: v1
pkg-manager: yarn pkg-manager: yarn
@ -111,12 +111,12 @@ jobs:
test-migrations: test-migrations:
executor: executor:
name: default name: default
ruby-version: '2.7' ruby-version: '3.0'
steps: steps:
- checkout - checkout
- install-system-dependencies - install-system-dependencies
- install-ruby-dependencies: - install-ruby-dependencies:
ruby-version: '2.7' ruby-version: '3.0'
- wait-db - wait-db
- run: - run:
command: ./bin/rails db:create command: ./bin/rails db:create

2
.github/workflows/check-i18n.yml vendored
View file

@ -22,7 +22,7 @@ jobs:
- name: Set up Ruby - name: Set up Ruby
uses: ruby/setup-ruby@v1 uses: ruby/setup-ruby@v1
with: with:
ruby-version: '2.7' ruby-version: '3.0'
bundler-cache: true bundler-cache: true
- name: Check locale file normalization - name: Check locale file normalization
run: bundle exec i18n-tasks check-normalized run: bundle exec i18n-tasks check-normalized

2
.ruby-version
View file

@ -1 +1 @@
2.7.4 3.0.2

4
Dockerfile
View file

@ -25,8 +25,8 @@ RUN ARCH= && \
rm node-v$NODE_VER-linux-$ARCH.tar.gz && \ rm node-v$NODE_VER-linux-$ARCH.tar.gz && \
mv node-v$NODE_VER-linux-$ARCH /opt/node mv node-v$NODE_VER-linux-$ARCH /opt/node
# Install Ruby # Install Ruby 3.0
ENV RUBY_VER="2.7.4" ENV RUBY_VER="3.0.2"
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends build-essential \ apt-get install -y --no-install-recommends build-essential \
bison libyaml-dev libgdbm-dev libreadline-dev libjemalloc-dev \ bison libyaml-dev libgdbm-dev libreadline-dev libjemalloc-dev \

1
Gemfile
View file

@ -4,6 +4,7 @@ source 'https://rubygems.org'
ruby '>= 2.5.0', '< 3.1.0' ruby '>= 2.5.0', '< 3.1.0'
gem 'pkg-config', '~> 1.4' gem 'pkg-config', '~> 1.4'
gem 'rexml', '~> 3.2'
gem 'puma', '~> 5.5' gem 'puma', '~> 5.5'
gem 'rails', '~> 6.1.4' gem 'rails', '~> 6.1.4'

1
Gemfile.lock
View file

@ -758,6 +758,7 @@ DEPENDENCIES
rdf-normalize (~> 0.4) rdf-normalize (~> 0.4)
redis (~> 4.5) redis (~> 4.5)
redis-namespace (~> 1.8) redis-namespace (~> 1.8)
rexml (~> 3.2)
rqrcode (~> 2.1) rqrcode (~> 2.1)
rspec-rails (~> 5.0) rspec-rails (~> 5.0)
rspec-sidekiq (~> 3.1) rspec-sidekiq (~> 3.1)