MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-05-12 12:54:07 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(infra) - Continue workflow when merge queue skipper fail (#10509)

Browse Source 
Co-authored-by: Shi Shu <shii@google.com>
This commit is contained in:
shishu314
2025-10-28 14:30:05 -04:00
committed by GitHub
parent c2d60d61ac
commit 7a238bd938
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/e2e.yml
+5 -3
View File
@@ -30,6 +30,7 @@ jobs:
merge_queue_skipper: merge_queue_skipper:
name: 'Merge Queue Skipper' name: 'Merge Queue Skipper'
runs-on: 'gemini-cli-ubuntu-16-core' runs-on: 'gemini-cli-ubuntu-16-core'
permissions: 'read-all'
outputs: outputs:
skip: '${{ steps.merge-queue-e2e-skipper.outputs.skip-check }}' skip: '${{ steps.merge-queue-e2e-skipper.outputs.skip-check }}'
steps: steps:
@@ -37,12 +38,13 @@ jobs:
uses: 'cariad-tech/merge-queue-ci-skipper@1032489e59437862c90a08a2c92809c903883772' # ratchet:cariad-tech/merge-queue-ci-skipper@main uses: 'cariad-tech/merge-queue-ci-skipper@1032489e59437862c90a08a2c92809c903883772' # ratchet:cariad-tech/merge-queue-ci-skipper@main
with: with:
secret: '${{ secrets.GITHUB_TOKEN }}' secret: '${{ secrets.GITHUB_TOKEN }}'
continue-on-error: true
e2e_linux: e2e_linux:
name: 'E2E Test (Linux) - ${{ matrix.sandbox }}' name: 'E2E Test (Linux) - ${{ matrix.sandbox }}'
needs: 'merge_queue_skipper' needs: 'merge_queue_skipper'
if: | if: |
needs.merge_queue_skipper.outputs.skip == 'false' && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip == 'false') &&
(github.event_name == 'push' || (github.event_name == 'push' ||
github.event_name == 'merge_group' || github.event_name == 'merge_group' ||
github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_dispatch' ||
@@ -104,7 +106,7 @@ jobs:
name: 'E2E Test (macOS)' name: 'E2E Test (macOS)'
needs: 'merge_queue_skipper' needs: 'merge_queue_skipper'
if: | if: |
needs.merge_queue_skipper.outputs.skip == 'false' && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip == 'false') &&
(github.event_name == 'push' || (github.event_name == 'push' ||
github.event_name == 'merge_group' || github.event_name == 'merge_group' ||
github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_dispatch' ||
@@ -153,7 +155,7 @@ jobs:
name: 'Slow E2E - Win' name: 'Slow E2E - Win'
needs: 'merge_queue_skipper' needs: 'merge_queue_skipper'
if: | if: |
needs.merge_queue_skipper.outputs.skip == 'false' && (needs.merge_queue_skipper.result !='success' || needs.merge_queue_skipper.outputs.skip == 'false') &&
(github.event_name == 'push' || (github.event_name == 'push' ||
github.event_name == 'merge_group' || github.event_name == 'merge_group' ||
github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_dispatch' ||