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

Rails 7.1.1 upgrade #1321

Closed
wants to merge 23 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.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 6 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:

steps:
- uses: actions/checkout@v1
- name: Set up Ruby 2.7
- name: Set up Ruby 3.1
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
ruby-version: '3.1'
bundler-cache: true
- name: rubocop
run: |
Expand All @@ -25,7 +25,7 @@ jobs:
fail-fast: false
matrix:
ruby_version:
- '2.7'
- '3.1'

services:
db:
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
fail-fast: false
matrix:
ruby_version:
- '2.7'
- '3.1'

services:
db:
Expand Down Expand Up @@ -107,8 +107,6 @@ jobs:
fail-fast: false
matrix:
ruby_version:
- '2.7'
- '3.0'
- '3.1'
- '3.2'

Expand Down Expand Up @@ -141,7 +139,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0'
ruby-version: '3.1'
- name: Run setup script
run: |
git config --global user.email "you@example.com"
Expand All @@ -150,7 +148,7 @@ jobs:
export SHIPIT_GEM_PATH="${PWD}"
mkdir /tmp/new-app
cd /tmp/new-app
gem install rails -v '~> 7.0.2' --no-document
gem install rails -v '~> 7.1.1' --no-document
rails new shipit --skip-action-cable --skip-turbolinks --skip-action-mailer --skip-active-storage --skip-webpack-install --skip-action-mailbox --skip-action-text -m "${SHIPIT_GEM_PATH}/template.rb"
env:
SHIPIT_EDGE: "1"
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 3.1
Exclude:
- tmp/*
- bin/*
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Unreleased

* Upgraded to Rails 7.1.1

# 0.38.0

* Convert `commit_deployment_statuses.github_id` to bigint (#1312)
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ end
group :development, :test do
gem 'faker'
gem 'webmock'
gem 'rubocop', '1.18.3'
gem 'rubocop', '1.22.3'
gem 'rubocop-shopify', require: false
end

Expand Down
Loading
Loading