Skip to content

Commit 0a9f421

Browse files
authored
Merge pull request #238 from bokmann/build-matrix
Add ruby 4.0 to build matrix
2 parents 9ab2474 + 2ae6249 commit 0a9f421

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
name: CI
2-
on: [push, pull_request]
2+
on:
3+
push:
4+
branches: [develop]
5+
pull_request:
6+
branches: [develop]
37

48
jobs:
59
test:
610
runs-on: ubuntu-latest
711
strategy:
812
matrix:
9-
ruby: ["3.2", "3.3", "3.4"]
13+
ruby: ["3.2", "3.3", "3.4", "4.0"]
1014
bundler: [default]
1115
gemfile:
1216
- active_support_7

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com//), and thi
66

77
## [Unreleased] - TBD
88

9+
- Add Ruby 4.0 to build matrix ([#238])
10+
911
## [0.13.0] - 2022-06-26
1012

1113
- Allow specifying holidays on each invocation. ([#217], [#180])
@@ -154,6 +156,7 @@ No documentation yet, contributions welcome.
154156
[0.2.1]: https://github.com/bokmann/business_time/compare/v0.2.0..v0.2.1
155157
[0.2.0]: https://github.com/bokmann/business_time/compare/c71a80f..v0.2.0
156158

159+
[#238]: https://github.com/bokmann/business_time/pull/238
157160
[#217]: https://github.com/bokmann/business_time/pull/217
158161
[#180]: https://github.com/bokmann/business_time/pull/180
159162
[#215]: https://github.com/bokmann/business_time/pull/215

gemfiles/active_support_6.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ gemspec path: '../'
33

44
group :development, :test do
55
gem 'activesupport', '~> 6.0'
6+
gem 'concurrent-ruby', '< 1.3.5'
67
end

0 commit comments

Comments
 (0)