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

Test Ruby 3.4.0-rc1 #3103

Draft
wants to merge 5 commits into
base: main
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
12 changes: 12 additions & 0 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,26 @@ jobs:
- "7.0"
- "7.1"
- "7.2"
- "8.0"
ruby:
- "3.1"
- "3.2"
- "3.3"
- "3.4.0-rc1"
database:
- sqlite
- postgresql
- mariadb
exclude:
- rails: "8.0"
ruby: "3.1"
database: sqlite
- rails: "8.0"
ruby: "3.1"
database: postgresql
- rails: "8.0"
ruby: "3.1"
database: mariadb
env:
DB: ${{ matrix.database }}
DB_USER: alchemy_user
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install Ruby and gems
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.1"
ruby-version: "3.2"
bundler-cache: true
rubygems: "latest"
- name: Lint Ruby files
Expand Down
7 changes: 5 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ source "https://rubygems.org"

gemspec

rails_version = ENV.fetch("RAILS_VERSION", "7.2")
rails_version = ENV.fetch("RAILS_VERSION", "8.0")
gem "rails", "~> #{rails_version}.0"

if ENV["DB"].nil? || ENV["DB"] == "sqlite"
gem "sqlite3", (rails_version == "7.0") ? "~> 1.7.0" : "~> 2.0.0"
gem "sqlite3", (rails_version == "7.0") ? "~> 1.7" : "~> 2.0"
end
if ENV["DB"] == "mysql" || ENV["DB"] == "mariadb"
gem "mysql2", "~> 0.5.1"
Expand Down Expand Up @@ -65,3 +65,6 @@ gem "dartsass-rails", "~> 0.5.0"
gem "propshaft", "~> 1.0"

gem "gem-release", "~> 2.2"

# Necessary for Rails 7.0 and Ruby 3.4
gem "mutex_m", "~> 0.3"
2 changes: 1 addition & 1 deletion alchemy_cms.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Gem::Specification.new do |gem|
activesupport
railties
].each do |rails_gem|
gem.add_runtime_dependency rails_gem, [">= 7.0", "< 7.3"]
gem.add_runtime_dependency rails_gem, [">= 7.0", "< 8.1"]
end

gem.add_runtime_dependency "active_model_serializers", ["~> 0.10.14"]
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module Dummy
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
if config.respond_to?(:load_defaults)
config.load_defaults ENV["RAILS_VERSION"] || 7.2
config.load_defaults ENV["RAILS_VERSION"] || 8.0
end

# Settings in config/environments/* take precedence over those specified here.
Expand Down
2 changes: 1 addition & 1 deletion spec/dummy/db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema[7.2].define(version: 2024_04_11_155901) do
ActiveRecord::Schema[8.0].define(version: 2024_04_11_155901) do
create_table "alchemy_attachments", force: :cascade do |t|
t.string "name"
t.string "file_name"
Expand Down
Loading