Revert "fix(infra) - Remove e2e maintainer label from e2e workflow" (#11292)

This commit is contained in:
shishu314
2025-10-16 15:14:09 -04:00
committed by GitHub
parent 39cc07de30
commit bec2bfcadb
+12 -10
View File
@@ -9,7 +9,9 @@ on:
branches: branches:
- 'main' - 'main'
- 'release/**' - 'release/**'
# This will run for PRs from forks when a label is added.
pull_request_target: pull_request_target:
types: ['labeled']
merge_group: merge_group:
workflow_dispatch: workflow_dispatch:
inputs: inputs:
@@ -44,8 +46,8 @@ jobs:
(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' ||
(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || (github.event.pull_request.head.repo.full_name == github.repository) ||
(github.event_name == 'pull_request_target')) (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
@@ -106,8 +108,8 @@ jobs:
(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' ||
(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || (github.event.pull_request.head.repo.full_name == github.repository) ||
(github.event_name == 'pull_request_target')) (github.event.label.name == 'maintainer:e2e:ok'))
runs-on: 'macos-latest' runs-on: 'macos-latest'
steps: steps:
- name: 'Checkout (fork)' - name: 'Checkout (fork)'
@@ -155,8 +157,8 @@ jobs:
(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' ||
(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || (github.event.pull_request.head.repo.full_name == github.repository) ||
(github.event_name == 'pull_request_target')) (github.event.label.name == 'maintainer:e2e:ok'))
runs-on: 'gemini-cli-windows-16-core' runs-on: 'gemini-cli-windows-16-core'
continue-on-error: true continue-on-error: true
@@ -225,8 +227,8 @@ jobs:
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' ||
(github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository) || (github.event.pull_request.head.repo.full_name == github.repository) ||
(github.event_name == 'pull_request_target') (github.event.label.name == 'maintainer:e2e:ok')
) )
needs: needs:
- 'e2e_linux' - 'e2e_linux'
@@ -235,8 +237,8 @@ jobs:
steps: steps:
- name: 'Check E2E test results' - name: 'Check E2E test results'
run: | run: |
if [[ ${{ needs.e2e_linux.result }} != 'success' || \ if [[ (${{ needs.e2e_linux.result }} != 'success' && ${{ needs.e2e_linux.result }} != 'skipped') || \
${{ needs.e2e_mac.result }} != 'success' ]]; then (${{ needs.e2e_mac.result }} != 'success' && ${{ needs.e2e_mac.result }} != 'skipped') ]]; then
echo "One or more E2E jobs failed." echo "One or more E2E jobs failed."
exit 1 exit 1
fi fi