remove merge queue skipper (#8819)

This commit is contained in:
matt korwel
2025-09-18 22:07:47 -07:00
committed by GitHub
parent 3f16ed5a9a
commit c434a7e682
2 changed files with 9 additions and 43 deletions
+1 -28
View File
@@ -27,26 +27,9 @@ defaults:
shell: 'bash' shell: 'bash'
jobs: jobs:
merge_queue_skipper:
name: 'Merge Queue Skipper'
runs-on: 'ubuntu-latest'
outputs:
skip: '${{ steps.skipper.outputs.skip }}'
steps:
- name: 'Check if skip'
id: 'skipper'
uses: 'fkirc/skip-duplicate-actions@f75f66ce1886f00957d99748a42c724f4330bdcf' # ratchet:fkirc/skip-duplicate-actions@v5
with:
concurrent_skipping: 'never'
skip_after_successful_duplicate: 'true'
paths_ignore: '["**.md", "docs/**"]'
do_not_skip: '["push", "workflow_dispatch", "schedule"]'
lint: lint:
name: 'Lint' name: 'Lint'
runs-on: 'gemini-cli-ubuntu-16-core' runs-on: 'gemini-cli-ubuntu-16-core'
needs: 'merge_queue_skipper'
if: "needs.merge_queue_skipper.outputs.skip != 'true'"
steps: steps:
- name: 'Checkout' - name: 'Checkout'
uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5 uses: 'actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8' # ratchet:actions/checkout@v5
@@ -87,9 +70,7 @@ jobs:
name: 'Test (Linux)' name: 'Test (Linux)'
runs-on: 'gemini-cli-ubuntu-16-core' runs-on: 'gemini-cli-ubuntu-16-core'
needs: needs:
- 'merge_queue_skipper'
- 'lint' - 'lint'
if: "needs.merge_queue_skipper.outputs.skip != 'true'"
permissions: permissions:
contents: 'read' contents: 'read'
checks: 'write' checks: 'write'
@@ -146,9 +127,7 @@ jobs:
name: 'Slow Test - Mac' name: 'Slow Test - Mac'
runs-on: '${{ matrix.os }}' runs-on: '${{ matrix.os }}'
needs: needs:
- 'merge_queue_skipper'
- 'lint' - 'lint'
if: "needs.merge_queue_skipper.outputs.skip != 'true'"
permissions: permissions:
contents: 'read' contents: 'read'
checks: 'write' checks: 'write'
@@ -215,8 +194,6 @@ jobs:
codeql: codeql:
name: 'CodeQL' name: 'CodeQL'
runs-on: 'gemini-cli-ubuntu-16-core' runs-on: 'gemini-cli-ubuntu-16-core'
needs: 'merge_queue_skipper'
if: "needs.merge_queue_skipper.outputs.skip != 'true'"
permissions: permissions:
actions: 'read' actions: 'read'
contents: 'read' contents: 'read'
@@ -236,8 +213,7 @@ jobs:
# Check for changes in bundle size. # Check for changes in bundle size.
bundle_size: bundle_size:
name: 'Check Bundle Size' name: 'Check Bundle Size'
if: "github.event_name == 'pull_request' && needs.merge_queue_skipper.outputs.skip != 'true'" if: "github.event_name == 'pull_request'"
needs: 'merge_queue_skipper'
runs-on: 'gemini-cli-ubuntu-16-core' runs-on: 'gemini-cli-ubuntu-16-core'
permissions: permissions:
contents: 'read' # For checkout contents: 'read' # For checkout
@@ -259,8 +235,6 @@ jobs:
test_windows: test_windows:
name: 'Slow Test - Win' name: 'Slow Test - Win'
needs: 'merge_queue_skipper'
if: "needs.merge_queue_skipper.outputs.skip != 'true'"
runs-on: 'gemini-cli-windows-16-core' runs-on: 'gemini-cli-windows-16-core'
continue-on-error: true continue-on-error: true
@@ -318,7 +292,6 @@ jobs:
name: 'CI' name: 'CI'
if: 'always()' if: 'always()'
needs: needs:
- 'merge_queue_skipper'
- 'lint' - 'lint'
- 'test_linux' - 'test_linux'
- 'codeql' - 'codeql'
+8 -15
View File
@@ -68,15 +68,12 @@ jobs:
e2e_linux: e2e_linux:
name: 'E2E Test (Linux) - ${{ matrix.sandbox }}' name: 'E2E Test (Linux) - ${{ matrix.sandbox }}'
needs: needs:
- 'merge_queue_skipper'
- 'build' - 'build'
if: | if: |
needs.merge_queue_skipper.outputs.skip != 'true' && ( github.event_name == 'push' ||
github.event_name == 'push' || github.event_name == 'merge_group' ||
github.event_name == 'merge_group' || (github.event.pull_request.head.repo.full_name == github.repository) ||
(github.event.pull_request.head.repo.full_name == github.repository) || (github.event.label.name == 'maintainer:e2e:ok')
(github.event.label.name == 'maintainer:e2e:ok')
)
runs-on: 'gemini-cli-ubuntu-16-core' runs-on: 'gemini-cli-ubuntu-16-core'
strategy: strategy:
fail-fast: false fail-fast: false
@@ -134,15 +131,12 @@ jobs:
e2e_slow_platforms: e2e_slow_platforms:
name: 'Slow E2E - Mac' name: 'Slow E2E - Mac'
needs: needs:
- 'merge_queue_skipper'
- 'build' - 'build'
if: | if: |
needs.merge_queue_skipper.outputs.skip != 'true' && ( github.event_name == 'push' ||
github.event_name == 'push' || github.event_name == 'merge_group' ||
github.event_name == 'merge_group' || (github.event.pull_request.head.repo.full_name == github.repository) ||
(github.event.pull_request.head.repo.full_name == github.repository) || (github.event.label.name == 'maintainer:e2e:ok')
(github.event.label.name == 'maintainer:e2e:ok')
)
runs-on: '${{ matrix.os }}' runs-on: '${{ matrix.os }}'
continue-on-error: true continue-on-error: true
strategy: strategy:
@@ -260,7 +254,6 @@ jobs:
name: 'E2E' name: 'E2E'
if: 'always()' if: 'always()'
needs: needs:
- 'merge_queue_skipper'
- 'e2e_linux' - 'e2e_linux'
runs-on: 'gemini-cli-ubuntu-16-core' runs-on: 'gemini-cli-ubuntu-16-core'
steps: steps: