Skip to content
Merged
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
10 changes: 7 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ name: CI

on:
pull_request:
types: [ opened, reopened, synchronize ]
types: [opened, reopened, synchronize]
push:
branches:
- 'main'
- "main"
workflow_dispatch:

jobs:
test:
Expand Down Expand Up @@ -56,7 +57,10 @@ jobs:
- ruby-version: "3.3"
gemfile: Gemfile.rails-8-0
experimental: false
- ruby-version: "3.3"
- ruby-version: "3.4"
gemfile: Gemfile.rails-8-1
experimental: false
- ruby-version: "3.4"
gemfile: Gemfile.rails-main
experimental: true

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
eval_gemfile "#{__dir__}/Gemfile.rails-8-0"
eval_gemfile "#{__dir__}/Gemfile.rails-8-1"
5 changes: 5 additions & 0 deletions Gemfile.rails-8-1
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
group :development, :test do
gem 'rails', '~> 8.1.0'
end

eval_gemfile "#{__dir__}/Gemfile.base"
2 changes: 1 addition & 1 deletion active_record_upsert.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ Gem::Specification.new do |spec|

spec.platform = Gem::Platform::RUBY

spec.add_runtime_dependency 'activerecord', '>= 5.2', '< 8.1'
spec.add_runtime_dependency 'activerecord', '>= 5.2', '< 8.2'
spec.add_runtime_dependency 'pg', '>= 0.18', '< 2.0'
end
5 changes: 5 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,9 @@
ActiveRecord::Tasks::DatabaseTasks.truncate_all
end
end

if ENV.key?('GITHUB_ACTIONS')
Comment thread
olleolleolle marked this conversation as resolved.
config.color = true
config.tty = true
end
end