Skip to content

Commit 2c0a276

Browse files
authored
fix windows ci (grosser#957)
* fix windows ci * debug * retry * 1.7 * drop ruby 2.7 since rails 6 test no longer runs with that * 3.3 fails on spinach somehow
1 parent c5dfb3c commit 2c0a276

File tree

91 files changed

+28
-1146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+28
-1146
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
strategy:
1111
fail-fast: false # run all tests so we see which gem/ruby combinations break
1212
matrix:
13-
ruby: ['2.7', '3.0', '3.1', '3.2', head, jruby-head]
13+
ruby: ['3.0', '3.1', '3.2', head, jruby-head]
1414
os: [ubuntu-latest, windows-latest]
1515
task: [spec]
1616
include:
17-
- ruby: '2.7' # lowest supported version, same as gemspec and .rubocop.yml
17+
- ruby: '3.0' # lowest supported version, same as gemspec and .rubocop.yml
1818
os: ubuntu-latest
1919
task: rubocop
2020
steps:

.rubocop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
AllCops:
22
NewCops: enable
3-
TargetRubyVersion: 2.7
3+
TargetRubyVersion: 3.0
44
SuggestExtensions: false
55
Exclude:
66
- '**/vendor/bundle/**/*'

Gemfile.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ PLATFORMS
121121
java
122122
ruby
123123
x64-mingw32
124+
x86_64-linux
124125

125126
DEPENDENCIES
126127
bump

lib/parallel_tests.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def pid_file_path
4444

4545
def stop_all_processes
4646
pids.all.each { |pid| Process.kill(:INT, pid) }
47-
rescue Errno::ESRCH
47+
rescue Errno::ESRCH, Errno::EPERM
4848
# Process already terminated, do nothing
4949
end
5050

lib/parallel_tests/cucumber/runner.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
module ParallelTests
55
module Cucumber
66
class Runner < ParallelTests::Gherkin::Runner
7-
SCENARIOS_RESULTS_BOUNDARY_REGEX = /^(Failing|Flaky) Scenarios:$/.freeze
8-
SCENARIO_REGEX = %r{^cucumber features/.+:\d+}.freeze
7+
SCENARIOS_RESULTS_BOUNDARY_REGEX = /^(Failing|Flaky) Scenarios:$/
8+
SCENARIO_REGEX = %r{^cucumber features/.+:\d+}
99

1010
class << self
1111
def name

parallel_tests.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ Gem::Specification.new name, ParallelTests::VERSION do |s|
1717
s.license = "MIT"
1818
s.executables = ["parallel_spinach", "parallel_cucumber", "parallel_rspec", "parallel_test"]
1919
s.add_runtime_dependency "parallel"
20-
s.required_ruby_version = '>= 2.7.0'
20+
s.required_ruby_version = '>= 3.0.0'
2121
end

spec/fixtures/rails60/.gitignore

Lines changed: 0 additions & 31 deletions
This file was deleted.

spec/fixtures/rails60/.ruby-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

spec/fixtures/rails60/Gemfile

Lines changed: 0 additions & 19 deletions
This file was deleted.

spec/fixtures/rails60/Gemfile.lock

Lines changed: 0 additions & 133 deletions
This file was deleted.

0 commit comments

Comments
 (0)