Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Merge pull request #9808" - fix MinGW CI #9856

Merged
merged 1 commit into from
Jun 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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