Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP]Update ruby 3.0.3 #3458

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
@@ -1,7 +1,7 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/blob/v0.205.1/containers/ruby/.devcontainer/base.Dockerfile

# [Choice] Ruby version (use -bullseye variants on local arm64/Apple Silicon): 3, 3.0, 2, 2.7, 2.6, 3-bullseye, 3.0-bullseye, 2-bullseye, 2.7-bullseye, 2.6-bullseye, 3-buster, 3.0-buster, 2-buster, 2.7-buster, 2.6-buster
ARG VARIANT=2.7-bullseye
ARG VARIANT=3.0-bullseye
FROM mcr.microsoft.com/vscode/devcontainers/ruby:${VARIANT}

# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.4
ruby-version: 3.0.3
bundler-cache: true

- name: Cache node modules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.7.4
ruby-version: 3.0.3
bundler-cache: true # runs 'bundle install' and caches installed gems automatically

- name: Cache node modules
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
@@ -1 +1 @@
2.7.4
3.0.3
2 changes: 1 addition & 1 deletion Dockerfile
@@ -1,4 +1,4 @@
FROM ruby:2.7.4-alpine
FROM ruby:3.0.3-alpine

ENV RAILS_ENV production
WORKDIR /app
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Expand Up @@ -3,7 +3,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.7.4'
ruby '3.0.3'

gem 'bootsnap', '>= 1.4.4', require: false
gem 'date', '>= 3.2.1' # CVE-2021-41817対応
Expand Down Expand Up @@ -48,7 +48,7 @@ gem 'rollbar'
gem 'rubyzip'
gem 'slim-rails'
gem 'sorcery'
gem 'sorcery-jwt'
gem 'sorcery-jwt', github: 'ima1zumi/sorcery-jwt', branch: 'relax-sorcery'
gem 'stripe'
gem 'stripe-i18n', git: 'https://github.com/komagata/stripe-i18n', branch: 'update-depencency'
gem 'sucker_punch', '~> 2.0'
Expand Down
28 changes: 17 additions & 11 deletions Gemfile.lock
@@ -1,3 +1,12 @@
GIT
remote: https://github.com/ima1zumi/sorcery-jwt.git
revision: 91c210461e67e911f8df15e719bd590e5fedb321
branch: relax-sorcery
specs:
sorcery-jwt (0.1.12)
jwt (>= 1.0, < 3.0)
sorcery (>= 0.13, < 0.17)

GIT
remote: https://github.com/komagata/stripe-i18n
revision: 584c711fc66ad71a5293a9dc21d717ec608c4692
Expand Down Expand Up @@ -208,7 +217,7 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.5.1)
jwt (2.2.2)
jwt (2.3.0)
kaminari (1.2.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.1)
Expand Down Expand Up @@ -261,8 +270,8 @@ GEM
racc (~> 1.4)
nokogiri (1.12.5-x86_64-darwin)
racc (~> 1.4)
oauth (0.5.5)
oauth2 (1.4.4)
oauth (0.5.8)
oauth2 (1.4.7)
faraday (>= 0.8, < 2.0)
jwt (>= 1.0, < 3.0)
multi_json (~> 1.3)
Expand Down Expand Up @@ -419,13 +428,10 @@ GEM
slim_lint (0.20.2)
rubocop (>= 0.78.0)
slim (>= 3.0, < 5.0)
sorcery (0.15.0)
sorcery (0.16.2)
bcrypt (~> 3.1)
oauth (~> 0.4, >= 0.4.4)
oauth (~> 0.5, >= 0.5.5)
oauth2 (~> 1.0, >= 0.8.0)
sorcery-jwt (0.1.11)
jwt (>= 1.0, < 3.0)
sorcery (>= 0.13, < 0.16)
spring (2.1.1)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
Expand Down Expand Up @@ -554,7 +560,7 @@ DEPENDENCIES
slim-rails
slim_lint
sorcery
sorcery-jwt
sorcery-jwt!
spring
spring-watcher-listen (~> 2.0.0)
stripe
Expand All @@ -569,7 +575,7 @@ DEPENDENCIES
webpacker (~> 5.0)

RUBY VERSION
ruby 2.7.4p191
ruby 3.0.3p157

BUNDLED WITH
2.2.30
2.2.32