Skip to content

Commit

Permalink
Revert "Merge pull request rubocop#9808 from koic/workaournd_for_ming…
Browse files Browse the repository at this point in the history
…w_build_error"

This reverts commit ac00a83, reversing
changes made to 5f64524.
  • Loading branch information
MSP-Greg committed Jun 5, 2021
1 parent 73975f9 commit 6ca1147
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ jobs:
# [ ubuntu, macos, windows ]
os: [ windows ]
ruby: [ '2.5', '2.6', '2.7', '3.0', 'head' ]
# FIXME: Please uncomment when https://github.com/ruby/psych/issues/494 is resolved.
# include:
# - { os: windows, ruby: mingw }
include:
- { os: windows, ruby: mingw }
exclude:
- { os: windows, ruby: head }

Expand Down
3 changes: 1 addition & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ pull_request_rules:
- "status-success=windows 2.6"
- "status-success=windows 2.7"
- "status-success=windows 3.0"
# FIXME: Please uncomment when https://github.com/ruby/psych/issues/494 is resolved.
# - "status-success=windows mingw"
- "status-success=windows mingw"
- "status-success=ci/circleci: cc-setup"
- "status-success=ci/circleci: cc-upload-coverage"
- "status-success=ci/circleci: documentation-checks"
Expand Down

0 comments on commit 6ca1147

Please sign in to comment.