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

Update Ruby version and fix Gemfile #793

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/cm42-central.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- name: Install Ruby and gems
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
ruby-version: 3.1
bundler-cache: true
# Add or replace database setup steps here
- name: Set up database schema
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
- name: Install Ruby and gems
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6
ruby-version: 3.1
bundler-cache: true
- name: Install Node
uses: actions/setup-node@v2
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
source 'https://rubygems.org'

ruby '~> 2.6'
ruby '~> 3.1'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
Expand Down Expand Up @@ -64,6 +64,7 @@ gem 'webpacker', '~> 5.4.3'
gem 'pusher'

source 'https://rails-assets.org' do
gem 'rails-assets-jquery'
gem 'rails-assets-jquery.gritter'
end

Expand Down
3 changes: 2 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,7 @@ DEPENDENCIES
rack-cors
rack-timeout
rails (~> 5.2.6.3)
rails-assets-jquery!
rails-assets-jquery.gritter!
rails-controller-testing
rails-i18n
Expand Down Expand Up @@ -690,7 +691,7 @@ DEPENDENCIES
webpacker (~> 5.4.3)

RUBY VERSION
ruby 2.6.8p205
ruby 3.1.2p20

BUNDLED WITH
1.17.3