Skip to content

Commit

Permalink
fix windows ci (#957)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
grosser committed May 20, 2024
1 parent c5dfb3c commit 2c0a276
Show file tree
Hide file tree
Showing 91 changed files with 28 additions and 1,146 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ jobs:
strategy:
fail-fast: false # run all tests so we see which gem/ruby combinations break
matrix:
ruby: ['2.7', '3.0', '3.1', '3.2', head, jruby-head]
ruby: ['3.0', '3.1', '3.2', head, jruby-head]
os: [ubuntu-latest, windows-latest]
task: [spec]
include:
- ruby: '2.7' # lowest supported version, same as gemspec and .rubocop.yml
- ruby: '3.0' # lowest supported version, same as gemspec and .rubocop.yml
os: ubuntu-latest
task: rubocop
steps:
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AllCops:
NewCops: enable
TargetRubyVersion: 2.7
TargetRubyVersion: 3.0
SuggestExtensions: false
Exclude:
- '**/vendor/bundle/**/*'
Expand Down
1 change: 1 addition & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ PLATFORMS
java
ruby
x64-mingw32
x86_64-linux

DEPENDENCIES
bump
Expand Down
2 changes: 1 addition & 1 deletion lib/parallel_tests.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def pid_file_path

def stop_all_processes
pids.all.each { |pid| Process.kill(:INT, pid) }
rescue Errno::ESRCH
rescue Errno::ESRCH, Errno::EPERM
# Process already terminated, do nothing
end

Expand Down
4 changes: 2 additions & 2 deletions lib/parallel_tests/cucumber/runner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
module ParallelTests
module Cucumber
class Runner < ParallelTests::Gherkin::Runner
SCENARIOS_RESULTS_BOUNDARY_REGEX = /^(Failing|Flaky) Scenarios:$/.freeze
SCENARIO_REGEX = %r{^cucumber features/.+:\d+}.freeze
SCENARIOS_RESULTS_BOUNDARY_REGEX = /^(Failing|Flaky) Scenarios:$/
SCENARIO_REGEX = %r{^cucumber features/.+:\d+}

class << self
def name
Expand Down
2 changes: 1 addition & 1 deletion parallel_tests.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ Gem::Specification.new name, ParallelTests::VERSION do |s|
s.license = "MIT"
s.executables = ["parallel_spinach", "parallel_cucumber", "parallel_rspec", "parallel_test"]
s.add_runtime_dependency "parallel"
s.required_ruby_version = '>= 2.7.0'
s.required_ruby_version = '>= 3.0.0'
end
31 changes: 0 additions & 31 deletions spec/fixtures/rails60/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion spec/fixtures/rails60/.ruby-version

This file was deleted.

19 changes: 0 additions & 19 deletions spec/fixtures/rails60/Gemfile

This file was deleted.

133 changes: 0 additions & 133 deletions spec/fixtures/rails60/Gemfile.lock

This file was deleted.

24 changes: 0 additions & 24 deletions spec/fixtures/rails60/README.md

This file was deleted.

6 changes: 0 additions & 6 deletions spec/fixtures/rails60/Rakefile

This file was deleted.

2 changes: 0 additions & 2 deletions spec/fixtures/rails60/app/assets/config/manifest.js

This file was deleted.

Empty file.
15 changes: 0 additions & 15 deletions spec/fixtures/rails60/app/assets/stylesheets/application.css

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Empty file.
2 changes: 0 additions & 2 deletions spec/fixtures/rails60/app/helpers/application_helper.rb

This file was deleted.

6 changes: 0 additions & 6 deletions spec/fixtures/rails60/app/javascript/channels/consumer.js

This file was deleted.

5 changes: 0 additions & 5 deletions spec/fixtures/rails60/app/javascript/channels/index.js

This file was deleted.

16 changes: 0 additions & 16 deletions spec/fixtures/rails60/app/javascript/packs/application.js

This file was deleted.

7 changes: 0 additions & 7 deletions spec/fixtures/rails60/app/jobs/application_job.rb

This file was deleted.

4 changes: 0 additions & 4 deletions spec/fixtures/rails60/app/mailers/application_mailer.rb

This file was deleted.

3 changes: 0 additions & 3 deletions spec/fixtures/rails60/app/models/application_record.rb

This file was deleted.

Empty file.
2 changes: 0 additions & 2 deletions spec/fixtures/rails60/app/models/user.rb

This file was deleted.

15 changes: 0 additions & 15 deletions spec/fixtures/rails60/app/views/layouts/application.html.erb

This file was deleted.

13 changes: 0 additions & 13 deletions spec/fixtures/rails60/app/views/layouts/mailer.html.erb

This file was deleted.

1 change: 0 additions & 1 deletion spec/fixtures/rails60/app/views/layouts/mailer.text.erb

This file was deleted.

4 changes: 0 additions & 4 deletions spec/fixtures/rails60/bin/rails

This file was deleted.

Loading

0 comments on commit 2c0a276

Please sign in to comment.