Skip to content

Commit 20c4c4f

Browse files
committed
Fix merge queue for forks (google-gemini#8816)
1 parent acba7ca commit 20c4c4f

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

.github/workflows/e2e.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
- name: 'Upload build artifacts'
6363
uses: 'actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02'
6464
with:
65-
name: 'build-artifacts'
65+
name: 'build-artifacts-${{ github.run_id }}'
6666
path: 'build-artifacts.tar'
6767

6868
e2e_linux:
@@ -102,7 +102,7 @@ jobs:
102102
- name: 'Download build artifacts'
103103
uses: 'actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093'
104104
with:
105-
name: 'build-artifacts'
105+
name: 'build-artifacts-${{ github.run_id }}'
106106
path: '.'
107107

108108
- name: 'Extract build artifacts'
@@ -168,7 +168,7 @@ jobs:
168168
- name: 'Download build artifacts'
169169
uses: 'actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093'
170170
with:
171-
name: 'build-artifacts'
171+
name: 'build-artifacts-${{ github.run_id }}'
172172
path: '.'
173173

174174
- name: 'Extract build artifacts'
@@ -196,9 +196,11 @@ jobs:
196196

197197
e2e_windows:
198198
name: 'Slow E2E - Win'
199-
if: "needs.merge_queue_skipper.outputs.skip != 'true'"
200-
needs:
201-
- 'merge_queue_skipper'
199+
if: |
200+
github.event_name == 'push' ||
201+
github.event_name == 'merge_group' ||
202+
(github.event.pull_request.head.repo.full_name == github.repository) ||
203+
(github.event.label.name == 'maintainer:e2e:ok')
202204
runs-on: 'gemini-cli-windows-16-core'
203205
continue-on-error: true
204206

0 commit comments

Comments
 (0)