Skip to content

Commit cd84729

Browse files
authored
Merge pull request #3032 from ruby/claude/merge-queue-issue-mlvufi
ci: fix the stuck merge queue, and run every CI workflow in it
2 parents 0078d60 + 19f7d16 commit cd84729

4 files changed

Lines changed: 14 additions & 0 deletions

File tree

.github/workflows/jruby.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ on:
1717
- "test/**"
1818
- "Rakefile"
1919
- "rbs.gemspec"
20+
# `merge_group` has no `paths` filter, so this runs on every queue entry.
21+
merge_group: {}
2022

2123
permissions:
2224
contents: read

.github/workflows/milestone.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ name: Check milestone
33
on:
44
pull_request:
55
types: [opened, edited, labeled, unlabeled, milestoned, demilestoned, synchronize]
6+
merge_group: {}
67

78
permissions:
89
contents: read
@@ -12,10 +13,16 @@ jobs:
1213
runs-on: ubuntu-latest
1314

1415
steps:
16+
# The milestone is a property of the pull request, so there is nothing to
17+
# check once it enters the merge queue. This job still has to run there
18+
# because `check` is a required status check -- it just reports success
19+
# without doing anything.
1520
- uses: actions/checkout@v7
21+
if: github.event_name == 'pull_request'
1622

1723
- name: Extract RBS::Version
1824
id: version
25+
if: github.event_name == 'pull_request'
1926
run: |
2027
# Extract version string from lib/rbs/version.rb
2128
version=$(ruby -e 'load "lib/rbs/version.rb"; print RBS::VERSION')
@@ -30,6 +37,7 @@ jobs:
3037
echo "RBS::VERSION = $version (major=$major, minor=$minor, patch=$patch)"
3138
3239
- name: Check milestone
40+
if: github.event_name == 'pull_request'
3341
uses: actions/github-script@v9
3442
with:
3543
script: |

.github/workflows/rust.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88
paths:
99
- ".github/workflows/rust.yml"
1010
- "rust/**"
11+
# `merge_group` has no `paths` filter, so this runs on every queue entry.
12+
merge_group: {}
1113

1214
env:
1315
RUSTFLAGS: "-D warnings"

.github/workflows/wasm.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ on:
1111
- "include/**"
1212
- "src/**"
1313
- "wasm/**"
14+
# `merge_group` has no `paths` filter, so this runs on every queue entry.
15+
merge_group: {}
1416

1517
permissions:
1618
contents: read

0 commit comments

Comments
 (0)