Skip to content

Commit

Permalink
Merge pull request #93 from coord-e/mysql-8.0
Browse files Browse the repository at this point in the history
Run tests with mysql:8.0 and drop support for Ruby < 3.0
  • Loading branch information
coord-e authored Apr 16, 2024
2 parents 8da0c07 + b69e38d commit 79f25d3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ jobs:
fail-fast: false
matrix:
ruby:
- '2.6'
- '2.7'
- '3.0'
- '3.1'
- '3.2'
- '3.3'
name: Run test with Ruby ${{ matrix.ruby }}
services:
mysql:
image: mysql:5.7
image: mysql:8.0
env:
MYSQL_ROOT_PASSWORD: barbeque_root
MYSQL_USER: barbeque
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
- Update Rails to 6.1
- For Zeitwerk, Barbeque::SNSSubscription and Barbeque::SNSSubscriptionService are renamed to Barbeque::SnsSubscription and Barbeque::SnsSubscriptionService respectively
- Support Ruby 3.0
- Drop support for Ruby < 3.0
- Drop support for MySQL 5.7

## v2.8.0 (2021-12-23)
### New features
Expand Down
7 changes: 1 addition & 6 deletions spec/barbeque/executor_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@
let(:barbeque_yml) { 'barbeque' }

it 'initializes a configured executor' do
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7.0')
# Ruby < 2.7 isn't ready for keyword arguments
expect(Barbeque::Executor::Docker).to receive(:new).with({})
else
expect(Barbeque::Executor::Docker).to receive(:new).with(no_args)
end
expect(Barbeque::Executor::Docker).to receive(:new).with(no_args)
Barbeque::Executor.create
end
end
Expand Down

0 comments on commit 79f25d3

Please sign in to comment.