Skip to content

Commit

Permalink
Merge pull request #323 from kpumuk/ruby34
Browse files Browse the repository at this point in the history
Switched default Ruby on CI to 3.3, and added 3.4
  • Loading branch information
kpumuk authored Dec 30, 2024
2 parents 0e78907 + 968bc5d commit 27b6735
Show file tree
Hide file tree
Showing 29 changed files with 269 additions and 414 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
fail-fast: true
matrix:
ruby-version:
- "3.2"
- "3.3"

name: Appraisal - Ruby ${{ matrix.ruby-version }}
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
fail-fast: true
matrix:
ruby-version:
- "3.2"
- "3.3"
rails-version:
- "7.1"
- "8.0"
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile
environment: release
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: StandardRB

on:
push:
branches: [ main ]
branches: [main]
pull_request:
branches: [ main ]
branches: [main]

jobs:
build:
Expand All @@ -16,9 +16,9 @@ jobs:
fail-fast: true
matrix:
ruby-version:
- "3.2"
- "3.3"
rails-version:
- "7.1"
- "8.0"
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/steep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ jobs:
fail-fast: true
matrix:
ruby-version:
- "3.2"
- "3.3"
rails-version:
- "7.1"
- "8.0"
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails-version }}.gemfile

Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
fail-fast: false
matrix:
ruby-version:
- "3.0"
- "3.1"
- "3.2"
- "3.3"
- "3.4"
rails-version:
- "6.1"
- "7.0"
Expand All @@ -25,17 +25,11 @@ jobs:
- "edge"
include:
- ruby-version: "3.3"
rails-version: "7.2"
rails-version: "8.0"
code-coverage: true
exclude:
- ruby-version: "3.0"
rails-version: "7.2"
- ruby-version: "3.0"
rails-version: "8.0"
- ruby-version: "3.1"
rails-version: "8.0"
- ruby-version: "3.0"
rails-version: "edge"
- ruby-version: "3.1"
rails-version: "edge"
env:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.2
3.3
9 changes: 9 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,25 @@
appraise "rails-6.1" do
gem "railties", "~> 6.1.7"
gem "zeitwerk", "~> 2.6.18" # 2.7+ requires Ruby 3.2, and we still support Ruby 3.0
gem "base64" # not part of the default gems starting from Ruby 3.4.0
gem "bigdecimal" # not part of the default gems starting from Ruby 3.4.0
gem "logger" # not part of the default gems starting from Ruby 3.5.0
gem "mutex_m" # not part of the default gems starting from Ruby 3.4.0
end

appraise "rails-7.0" do
gem "railties", "~> 7.0.8"
gem "zeitwerk", "~> 2.6.18" # 2.7+ requires Ruby 3.2, and we still support Ruby 3.0
gem "base64" # not part of the default gems starting from Ruby 3.4.0
gem "bigdecimal" # not part of the default gems starting from Ruby 3.4.0
gem "logger" # not part of the default gems starting from Ruby 3.5.0
gem "mutex_m" # not part of the default gems starting from Ruby 3.4.0
end

appraise "rails-7.1" do
gem "railties", "~> 7.1.4"
gem "zeitwerk", "~> 2.6.18" # 2.7+ requires Ruby 3.2, and we still support Ruby 3.0
gem "securerandom", "0.3.0" # 0.4.0 requires ruby version >= 3.1.0
end

appraise "rails-7.2" do
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ source "https://rubygems.org"
gemspec

# Ruby typings
gem "steep", "~> 1.7.1", platform: :mri_32
gem "steep", "~> 1.9.3", platform: :mri_33
8 changes: 0 additions & 8 deletions gemfiles/rails_6.0.gemfile

This file was deleted.

198 changes: 0 additions & 198 deletions gemfiles/rails_6.0.gemfile.lock

This file was deleted.

6 changes: 5 additions & 1 deletion gemfiles/rails_6.1.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@

source "https://rubygems.org"

gem "steep", "~> 1.7.1", platform: :mri_32
gem "steep", "~> 1.9.3", platform: :mri_33
gem "railties", "~> 6.1.7"
gem "zeitwerk", "~> 2.6.18"
gem "base64"
gem "bigdecimal"
gem "logger"
gem "mutex_m"

gemspec path: "../"
Loading

0 comments on commit 27b6735

Please sign in to comment.