Skip to content

Commit

Permalink
Merge pull request rubocop#9808 from koic/workaournd_for_mingw_build_…
Browse files Browse the repository at this point in the history
…error

Workaround for mingw build error
  • Loading branch information
koic committed May 17, 2021
2 parents 5f64524 + 3ea0224 commit ac00a83
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/rubocop.yml
Expand Up @@ -22,8 +22,9 @@ jobs:
# [ ubuntu, macos, windows ]
os: [ windows ]
ruby: [ '2.5', '2.6', '2.7', '3.0', 'head' ]
include:
- { os: windows, ruby: mingw }
# FIXME: Please uncomment when https://github.com/ruby/psych/issues/494 is resolved.
# include:
# - { os: windows, ruby: mingw }
exclude:
- { os: windows, ruby: head }

Expand Down
3 changes: 2 additions & 1 deletion .mergify.yml
Expand Up @@ -12,7 +12,8 @@ pull_request_rules:
- "status-success=windows 2.6"
- "status-success=windows 2.7"
- "status-success=windows 3.0"
- "status-success=windows mingw"
# FIXME: Please uncomment when https://github.com/ruby/psych/issues/494 is resolved.
# - "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 ac00a83

Please sign in to comment.