Skip to content

Commit 3a6aa46

Browse files
authored
Remove official support for Ruby 2.5 and 2.6 (#89)
1 parent 888e1a6 commit 3a6aa46

File tree

4 files changed

+16
-12
lines changed

4 files changed

+16
-12
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
name: CI
22

3-
on: [push, pull_request]
3+
on:
4+
push:
5+
branches: [master]
6+
pull_request:
7+
branches: [master]
48

59
jobs:
610
test:
@@ -9,7 +13,7 @@ jobs:
913
strategy:
1014
fail-fast: false
1115
matrix:
12-
ruby-version: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5"]
16+
ruby-version: ["3.3", "3.2", "3.1", "3.0", "2.7"]
1317
steps:
1418
- uses: actions/checkout@v4
1519
- name: Set up Ruby

Gemfile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ gem 'rake', '~> 13.1', require: false
1010
gem 'yard', '~> 0.9', require: false
1111

1212
# Test tools
13-
gem 'pry', '~> 0.10', group: :development
14-
gem 'aruba', '~> 1.0.0'
15-
gem 'rspec', '~> 3.0'
16-
gem 'cucumber', '~> 2.0'
17-
gem 'capybara', '~> 2.5.0'
13+
gem 'aruba'
14+
gem 'cucumber'
15+
gem 'capybara'
16+
17+
# Optional dependencies, included for tests
1818
gem 'haml', RUBY_VERSION > '3.0' ? '< 7' : '< 6'
1919
gem 'slim', '>= 3', '< 5'
2020
gem 'kramdown'
21-
gem "redcarpet"
21+
gem 'redcarpet'
22+
gem 'rack', '< 3'

Rakefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ require 'bundler/gem_tasks'
22
require 'cucumber/rake/task'
33

44
Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
5-
exempt_tags = ""
6-
exempt_tags << "--tags ~@nojava " if RUBY_PLATFORM == "java"
7-
t.cucumber_opts = "--color --tags ~@wip #{exempt_tags} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
5+
exempt_tags = ["--tags 'not @wip'"]
6+
exempt_tags << "--tags 'not @nojava'" if RUBY_PLATFORM == "java"
7+
t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
88
end
99

1010
task :test => ["cucumber"]

features/support/env.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@
33
require "middleman-core"
44
require "middleman-core/step_definitions"
55
require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-syntax')
6-

0 commit comments

Comments
 (0)