Skip to content

Commit 7ec5407

Browse files
Merge pull request #68 from dafyddcrosby/ci_ruby_31
[github] Remove Ruby 2.5+2,6 tests, add Ruby 3.0+3.1 tests, update dev gems
2 parents 1a2b5a3 + 4e86f92 commit 7ec5407

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
strategy:
99
fail-fast: false
1010
matrix:
11-
ruby: [2.5, 2.6, 2.7]
11+
ruby: ['2.7', '3.0', '3.1']
1212
runs-on: ubuntu-latest
1313
steps:
1414
- name: Checkout repository
@@ -19,6 +19,8 @@ jobs:
1919
ruby-version: ${{ matrix.ruby }}
2020
- name: Install dependencies
2121
run: bundle install
22+
- name: Install subversion for functional tests
23+
run: sudo apt-get install -y subversion
2224
- name: Run rspec
2325
run: bundle exec rspec
2426
- name: Run rubocop

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,4 @@ test/syntaxcache/
2525
.vagrant
2626
.bundle
2727
.bundler
28+
.rubocop-https*

Gemfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ gemspec
44

55
group :development, :test do
66
gem 'between_meals', :git => 'https://github.com/facebook/between-meals'
7-
gem 'chef-dk', '~> 3.13.0'
8-
gem 'chef-zero'
7+
gem 'chef', '= 16.18.0'
8+
gem 'chef-zero', '>= 15.0.11'
99
gem 'openssl'
1010
gem 'rspec-core', '>= 3.0.0'
1111
gem 'rspec-expectations', '>= 3.0.0'
1212
gem 'rspec-mocks', '>= 3.0.0'
13-
gem 'rubocop', '= 1.3.1'
13+
gem 'rubocop', '= 1.25.1'
1414
gem 'rugged'
1515
gem 'simplecov'
16+
gem 'webrick' # chef-zero dep
1617
end

grocery_delivery.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
2929
s.bindir = %w{bin}
3030
s.executables = %w{grocery-delivery}
3131

32-
s.required_ruby_version = '>= 2.5.0'
32+
s.required_ruby_version = '>= 2.7.0'
3333
s.add_dependency 'between_meals', '>= 0.0.11'
3434
s.add_dependency 'mixlib-config'
3535
end

0 commit comments

Comments
 (0)