Skip to content

Commit

Permalink
Merge pull request #135 from pat/rubygems-build-fix
Browse files Browse the repository at this point in the history
Avoid updating Rubygems
  • Loading branch information
pat authored Jan 14, 2024
2 parents da55de7 + 06058f9 commit 30cb9bb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [ '2.6', '2.7', '3.0', '3.1', '3.2' ]
ruby: [ '2.6', '2.7', '3.0', '3.1', '3.2', '3.3' ]
bundler: [ '1.17.3', '2.3.12' ]
database: [ 'mysql2', 'postgresql', 'sqlite3' ]
exclude:
Expand All @@ -23,6 +23,8 @@ jobs:
bundler: '1.17.3'
- ruby: '3.2'
bundler: '1.17.3'
- ruby: '3.3'
bundler: '1.17.3'

services:
postgres:
Expand Down Expand Up @@ -58,8 +60,6 @@ jobs:
export BUNDLER_VERSION=${{ matrix.bundler }}
export BUNDLE_PATH=$PWD/vendor/bundle
gem update --system
bundle _${{ matrix.bundler }}_ config set path $PWD/$BUNDLE_PATH
bundle _${{ matrix.bundler }}_ install --jobs=4 --retry=3
bundle _${{ matrix.bundler }}_ update
Expand Down
12 changes: 10 additions & 2 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ if RUBY_VERSION.to_f >= 2.5 && RUBY_VERSION.to_f < 3.1
appraise "rails-6.0" do
gem "rails", "~> 6.0.0"
gem "mysql2", "~> 0.5.0"
gem "sqlite3", "~> 1.4"
gem "sqlite3", "~> 1.4", "< 1.5.0"
end
end

if RUBY_VERSION.to_f >= 2.5
appraise "rails-6.1" do
gem "rails", "~> 6.1.0"
gem "mysql2", "~> 0.5.0"
gem "sqlite3", "~> 1.4"
gem "sqlite3", "~> 1.4", "< 1.6.0"
end
end

Expand All @@ -42,6 +42,14 @@ if RUBY_VERSION.to_f >= 2.7
gem "sqlite3", "~> 1.4"
end

appraise "rails-7.1" do
gem "rails", "~> 7.1.2"
gem "mysql2", "~> 0.5.0"
gem "sqlite3", "~> 1.4"
end
end

if RUBY_VERSION.to_f >= 3.1
appraise "rails-edge" do
gem "rails", :git => "https://github.com/rails/rails.git", :branch => "main"
gem "mysql2", "~> 0.5.0"
Expand Down

0 comments on commit 30cb9bb

Please sign in to comment.