Skip to content

Commit b142eb3

Browse files
mattKorwelabhipatel12
authored andcommitted
remove merge queue skipper (#8819)
1 parent 5af70d1 commit b142eb3

File tree

2 files changed

+9
-43
lines changed

2 files changed

+9
-43
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,9 @@ defaults:
2727
shell: 'bash'
2828

2929
jobs:
30-
merge_queue_skipper:
31-
name: 'Merge Queue Skipper'
32-
runs-on: 'ubuntu-latest'
33-
outputs:
34-
skip: '${{ steps.skipper.outputs.skip }}'
35-
steps:
36-
- name: 'Check if skip'
37-
id: 'skipper'
38-
uses: 'fkirc/skip-duplicate-actions@f75f66ce1886f00957d99748a42c724f4330bdcf' # ratchet:fkirc/skip-duplicate-actions@v5
39-
with:
40-
concurrent_skipping: 'never'
41-
skip_after_successful_duplicate: 'true'
42-
paths_ignore: '["**.md", "docs/**"]'
43-
do_not_skip: '["push", "workflow_dispatch", "schedule"]'
44-
4530
lint:
4631
name: 'Lint'
4732
runs-on: 'gemini-cli-ubuntu-16-core'
48-
needs: 'merge_queue_skipper'
49-
if: "needs.merge_queue_skipper.outputs.skip != 'true'"
5033
steps:
5134
- name: 'Checkout'
5235
uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
@@ -87,9 +70,7 @@ jobs:
8770
name: 'Test (Linux)'
8871
runs-on: 'gemini-cli-ubuntu-16-core'
8972
needs:
90-
- 'merge_queue_skipper'
9173
- 'lint'
92-
if: "needs.merge_queue_skipper.outputs.skip != 'true'"
9374
permissions:
9475
contents: 'read'
9576
checks: 'write'
@@ -146,9 +127,7 @@ jobs:
146127
name: 'Slow Test - Mac'
147128
runs-on: '${{ matrix.os }}'
148129
needs:
149-
- 'merge_queue_skipper'
150130
- 'lint'
151-
if: "needs.merge_queue_skipper.outputs.skip != 'true'"
152131
permissions:
153132
contents: 'read'
154133
checks: 'write'
@@ -215,8 +194,6 @@ jobs:
215194
codeql:
216195
name: 'CodeQL'
217196
runs-on: 'gemini-cli-ubuntu-16-core'
218-
needs: 'merge_queue_skipper'
219-
if: "needs.merge_queue_skipper.outputs.skip != 'true'"
220197
permissions:
221198
actions: 'read'
222199
contents: 'read'
@@ -236,8 +213,7 @@ jobs:
236213
# Check for changes in bundle size.
237214
bundle_size:
238215
name: 'Check Bundle Size'
239-
if: "github.event_name == 'pull_request' && needs.merge_queue_skipper.outputs.skip != 'true'"
240-
needs: 'merge_queue_skipper'
216+
if: "github.event_name == 'pull_request'"
241217
runs-on: 'gemini-cli-ubuntu-16-core'
242218
permissions:
243219
contents: 'read' # For checkout
@@ -259,8 +235,6 @@ jobs:
259235

260236
test_windows:
261237
name: 'Slow Test - Win'
262-
needs: 'merge_queue_skipper'
263-
if: "needs.merge_queue_skipper.outputs.skip != 'true'"
264238
runs-on: 'gemini-cli-windows-16-core'
265239
continue-on-error: true
266240

@@ -318,7 +292,6 @@ jobs:
318292
name: 'CI'
319293
if: 'always()'
320294
needs:
321-
- 'merge_queue_skipper'
322295
- 'lint'
323296
- 'test_linux'
324297
- 'codeql'

.github/workflows/e2e.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,12 @@ jobs:
6868
e2e_linux:
6969
name: 'E2E Test (Linux) - ${{ matrix.sandbox }}'
7070
needs:
71-
- 'merge_queue_skipper'
7271
- 'build'
7372
if: |
74-
needs.merge_queue_skipper.outputs.skip != 'true' && (
75-
github.event_name == 'push' ||
76-
github.event_name == 'merge_group' ||
77-
(github.event.pull_request.head.repo.full_name == github.repository) ||
78-
(github.event.label.name == 'maintainer:e2e:ok')
79-
)
73+
github.event_name == 'push' ||
74+
github.event_name == 'merge_group' ||
75+
(github.event.pull_request.head.repo.full_name == github.repository) ||
76+
(github.event.label.name == 'maintainer:e2e:ok')
8077
runs-on: 'gemini-cli-ubuntu-16-core'
8178
strategy:
8279
fail-fast: false
@@ -134,15 +131,12 @@ jobs:
134131
e2e_slow_platforms:
135132
name: 'Slow E2E - Mac'
136133
needs:
137-
- 'merge_queue_skipper'
138134
- 'build'
139135
if: |
140-
needs.merge_queue_skipper.outputs.skip != 'true' && (
141-
github.event_name == 'push' ||
142-
github.event_name == 'merge_group' ||
143-
(github.event.pull_request.head.repo.full_name == github.repository) ||
144-
(github.event.label.name == 'maintainer:e2e:ok')
145-
)
136+
github.event_name == 'push' ||
137+
github.event_name == 'merge_group' ||
138+
(github.event.pull_request.head.repo.full_name == github.repository) ||
139+
(github.event.label.name == 'maintainer:e2e:ok')
146140
runs-on: '${{ matrix.os }}'
147141
continue-on-error: true
148142
strategy:
@@ -260,7 +254,6 @@ jobs:
260254
name: 'E2E'
261255
if: 'always()'
262256
needs:
263-
- 'merge_queue_skipper'
264257
- 'e2e_linux'
265258
runs-on: 'gemini-cli-ubuntu-16-core'
266259
steps:

0 commit comments

Comments
 (0)