Skip to content

Commit afbca87

Browse files
committed
Upgraded CI matrix.
1 parent 65d47f7 commit afbca87

File tree

12 files changed

+34
-16
lines changed

12 files changed

+34
-16
lines changed

.github/workflows/danger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Set up Ruby
1212
uses: ruby/setup-ruby@v1
1313
with:
14-
ruby-version: 2.6
14+
ruby-version: 3.4
1515
bundler-cache: true
1616
- name: Run Danger
1717
env:

.github/workflows/rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- name: Set up Ruby
1111
uses: ruby/setup-ruby@v1
1212
with:
13-
ruby-version: '3.1'
13+
ruby-version: 3.4
1414
bundler-cache: true
1515
- name: Run RuboCop
1616
run: bundle exec rubocop

.github/workflows/test-mongodb.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,15 @@ jobs:
77
strategy:
88
matrix:
99
entry:
10-
- { ruby: 2.6.2, mongoid: 6.4.8, mongodb: 4.4 }
11-
- { ruby: 2.6.2, mongoid: 7.2.3, mongodb: 4.4 }
12-
- { ruby: 2.6.2, mongoid: 7.3.0, mongodb: 4.4 }
13-
- { ruby: 3.1.1, mongoid: 7.3.0, mongodb: 4.4 }
14-
- { ruby: 3.1.1, mongoid: 7.3.0, mongodb: 5.0 }
15-
- { ruby: 3.2.1, mongoid: 7.5.2, mongodb: 5.0 }
10+
- { ruby: 2.7, mongoid: 6.4.8, mongodb: 4.4 }
11+
- { ruby: 2.7, mongoid: 7.2.3, mongodb: 4.4 }
12+
- { ruby: 2.7, mongoid: 7.3.0, mongodb: 4.4 }
13+
- { ruby: 3.2, mongoid: 7.3.0, mongodb: 4.4 }
14+
- { ruby: 3.3, mongoid: 7.3.0, mongodb: 5.0 }
15+
- { ruby: 3.4, mongoid: 7.5.2, mongodb: 5.0 }
16+
- { ruby: 3.4, mongoid: 8.1.11, mongodb: 6.0 }
17+
- { ruby: 3.4, mongoid: 8.1.11, mongodb: 7.0 }
18+
- { ruby: 3.4, mongoid: 8.1.11, mongodb: 8.0 }
1619
name: test (ruby=${{ matrix.entry.ruby }}, mongoid=${{ matrix.entry.mongoid }}, mongodb=${{ matrix.entry.mongodb }})
1720
steps:
1821
- uses: actions/checkout@v2

.github/workflows/test-postgresql.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ jobs:
77
strategy:
88
matrix:
99
entry:
10-
- { ruby: 2.6.2, postgresql: 11, active_record: '~> 6.0.0' }
11-
- { ruby: 3.1.1, postgresql: 11, active_record: '~> 6.1.0' }
12-
- { ruby: 3.1.1, postgresql: 14, active_record: '~> 7.0.0' }
13-
- { ruby: 3.1.1, postgresql: 14, active_record: '~> 7.2.0' }
10+
- { ruby: 2.7, postgresql: 11, active_record: '~> 6.0.0' }
11+
- { ruby: 3.1, postgresql: 11, active_record: '~> 6.1.0' }
12+
- { ruby: 3.2, postgresql: 14, active_record: '~> 7.0.0' }
13+
- { ruby: 3.3, postgresql: 14, active_record: '~> 7.2.0' }
14+
- { ruby: 3.4, postgresql: 14, active_record: '~> 7.2.0' }
1415
name: test (ruby=${{ matrix.entry.ruby }}, postgresql=${{ matrix.entry.postgresql }}, active_record=${{ matrix.entry.active_record }})
1516
steps:
1617
- uses: actions/checkout@v2

.rubocop_todo.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2025-09-22 12:03:02 UTC using RuboCop version 1.80.2.
3+
# on 2025-09-22 12:22:59 UTC using RuboCop version 1.80.2.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
* [#176](https://github.com/slack-ruby/slack-ruby-bot-server/pull/176): Deps: bump mongoid-scroll to 2.0 - [@markokajzer](https://github.com/markokajzer).
66
* [#175](https://github.com/slack-ruby/slack-ruby-bot-server/pull/175): Fix(activerecord): correctly check for database in rails 7.2+ - [@markokajzer](https://github.com/markokajzer).
7+
* [#178](https://github.com/slack-ruby/slack-ruby-bot-server/pull/178): Add support for Mongoid 8 - [@dblock](https://github.com/dblock).
8+
* [#178](https://github.com/slack-ruby/slack-ruby-bot-server/pull/178): Cursor-helper now requires mongoid-scroll 2.x - [@dblock](https://github.com/dblock).
79
* Your contribution here.
810

911
### 2.1.1 (2023/07/25)

Gemfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ when 'mongoid' then
66
gem 'mongoid', ENV['MONGOID_VERSION'] || '~> 7.3.0'
77
gem 'mongoid-scroll', '~> 2.0'
88
gem 'mongoid-shell'
9+
gem 'mutex_m'
910

1011
group :development, :test do
1112
gem 'database_cleaner-mongoid', '~> 2.0.1'
@@ -30,7 +31,7 @@ gemspec
3031
group :development, :test do
3132
gem 'bundler'
3233
gem 'byebug'
33-
gem 'capybara', '~> 3.36.0'
34+
gem 'capybara', '~> 3.40.0'
3435
gem 'fabrication'
3536
gem 'faker'
3637
gem 'faraday', '0.17.5'
@@ -41,8 +42,8 @@ group :development, :test do
4142
gem 'rake'
4243
gem 'rspec'
4344
gem 'rubocop', '1.80.2'
44-
gem 'selenium-webdriver', '~> 4.1.0'
45+
gem 'selenium-webdriver', '~> 4.35.0'
4546
gem 'vcr'
4647
gem 'webmock'
47-
gem 'webrick', '~> 1.6.1'
48+
gem 'webrick', '~> 1.9.1'
4849
end

Gemfile.danger

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
source 'https://rubygems.org'
22

33
group :test do
4+
gem 'danger', '~> 7.0.1'
45
gem 'danger-toc', '~> 0.2.0', require: false
56
gem 'slack-ruby-danger', '~> 0.2.0', require: false
67
end

UPGRADING.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
Upgrading Slack-Ruby-Bot-Server
22
===============================
33

4+
### Upgrading to >= 2.2.0
5+
6+
#### Cursor Helper Iterator Changes
7+
8+
The mongoid [cursor helper](lib/slack-ruby-bot-server/api/helpers/cursor_helpers.rb) now requires `mongoid-scroll` 2.x, the second argument to `scroll` has changed. See mongoid-scroll [UPGRADING](https://github.com/mongoid/mongoid-scroll/blob/master/UPGRADING.md#upgrading-to--200) for more information.
9+
410
### Upgrading to >= 2.0.0
511

612
#### Replaced Pagination Gem for ActiveRecord

lib/slack-ruby-bot-server/api/helpers/sort_helpers.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ def sort(coll, options = {})
5151
end
5252
end
5353
coll = coll.all if coll.is_a?(Module) && coll.respond_to?(:all)
54+
coll
5455
end
5556
end
5657
end

0 commit comments

Comments
 (0)