[update] all with merge_group

.github/workflows/premerge-ci.yml

@@ -10,9 +10,6 @@ on:
     branches:
       - main
       - develop
-  push:
-    branches:
-      - ci/pr-**
 
 env:
   REGION: us-west-2
@@ -26,117 +23,8 @@ env:
   ECR_REPOSITORY: "roboverse-dev"
 
 jobs:
-  prepare-or-promote:
-    name: prepare-or-promote
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
-      issues: write
-    env:
-      PRIV_CI_PUSH_TOKEN: ${{ secrets.PRIV_CI_PUSH_TOKEN }}
-    outputs:
-      run_direct: ${{ steps.decide.outputs.run_direct }}
-      pr_number: ${{ steps.decide.outputs.pr_number }}
-      reason: ${{ steps.decide.outputs.reason }}
-    steps:
-      - name: Route CI flow
-        id: decide
-        env:
-          GITHUB_EVENT_NAME: ${{ github.event_name }}
-          GITHUB_REF: ${{ github.ref }}
-          PR_NUMBER: ${{ github.event.pull_request.number || '' }}
-          HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name || '' }}
-          BASE_REPO: ${{ github.repository }}
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_EVENT_PATH: ${{ github.event_path }}
-        run: |
-          RUN_DIRECT="false"
-          PR_NUM="${PR_NUMBER}"
-          REASON=""
-
-          case "$GITHUB_EVENT_NAME" in
-            merge_group)
-              echo "Event is merge_group. Running tests directly in merge queue context."
-              RUN_DIRECT="true"
-              REASON="merge_group_execution"
-              ;;
-            push)
-              if [[ "$GITHUB_REF" =~ ^refs/heads/ci/pr- ]]; then
-                RUN_DIRECT="true"
-                REASON="ci/pr-* push"
-                PR_NUM="${GITHUB_REF#refs/heads/ci/pr-}"
-              else
-                REASON="unsupported push ref"
-              fi
-              ;;
-            workflow_dispatch)
-              RUN_DIRECT="true"
-              REASON="manual dispatch"
-              ;;
-            pull_request_target)
-              if [ "$HEAD_REPO" = "$BASE_REPO" ]; then
-                REASON="same-repo PR, no promotion needed"
-              else
-                REASON="fork PR requires promotion"
-              fi
-              ;;
-            *)
-              REASON="unsupported event"
-              ;;
-          esac
-
-          echo "run_direct=${RUN_DIRECT}" >> "$GITHUB_OUTPUT"
-          echo "pr_number=${PR_NUM}" >> "$GITHUB_OUTPUT"
-          echo "reason=${REASON}" >> "$GITHUB_OUTPUT"
-
-      - name: Check actor permission
-        id: perm
-        if: >
-          github.event_name == 'pull_request_target' &&
-          steps.decide.outputs.reason == 'fork PR requires promotion' &&
-          env.PRIV_CI_PUSH_TOKEN != '' &&
-          env.PRIV_CI_PUSH_TOKEN != null
-        env:
-          ACTOR: ${{ github.actor }}
-          REPO: ${{ github.repository }}
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          perm=$(gh api "repos/$REPO/collaborators/$ACTOR/permission" --jq .permission 2>/dev/null || echo "none")
-          echo "permission=$perm" >> "$GITHUB_OUTPUT"
-          echo "Actor: $ACTOR, permission: $perm"
-
-      - name: Checkout repository for promotion
-        if: >
-          github.event_name == 'pull_request_target' &&
-          steps.decide.outputs.reason == 'fork PR requires promotion' &&
-          (steps.perm.outputs.permission == 'write' || steps.perm.outputs.permission == 'maintain' || steps.perm.outputs.permission == 'admin')
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.PRIV_CI_PUSH_TOKEN }}
-
-      - name: Promote fork PR to ci/pr-* branch
-        if: >
-          github.event_name == 'pull_request_target' &&
-          steps.decide.outputs.reason == 'fork PR requires promotion' &&
-          (steps.perm.outputs.permission == 'write' || steps.perm.outputs.permission == 'maintain' || steps.perm.outputs.permission == 'admin')
-        env:
-          PR_NUMBER: ${{ steps.decide.outputs.pr_number }}
-          REPO: ${{ github.repository }}
-          GH_TOKEN: ${{ secrets.PRIV_CI_PUSH_TOKEN }}
-        run: |
-          set -euo pipefail
-          BRANCH="ci/pr-${PR_NUMBER}"
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          gh pr checkout "$PR_NUMBER"
-          git push origin HEAD:"$BRANCH"
-
-
   pre-merge-tests:
-    needs: prepare-or-promote
-    if: needs.prepare-or-promote.outputs.run_direct == 'true'
+    if: github.event_name == 'merge_group' || github.event_name == 'workflow_dispatch'
     permissions:
       contents: write       # Need write access to delete ci/pr-* branches
       pull-requests: write
@@ -510,78 +398,3 @@ jobs:
             test_exit_codes.txt
           if-no-files-found: warn
           retention-days: 7
-
-
-      - name: Report commit status to PR
-        if: always()
-        uses: actions/github-script@v7
-        env:
-          JOB_STATUS: ${{ job.status }}
-          PRIV_CI_PUSH_TOKEN: ${{ secrets.PRIV_CI_PUSH_TOKEN }}
-        with:
-          github-token: ${{ secrets.PRIV_CI_PUSH_TOKEN }}
-          script: |
-            const status = process.env.JOB_STATUS;
-            const ref = context.ref;
-
-            // Only report status for ci/pr-* branches
-            const match = ref.match(/^refs\/heads\/ci\/pr-(\d+)$/);
-            if (!match) {
-              core.info(`Ref ${ref} is not a ci/pr-* branch, skip status reporting.`);
-              return;
-            }
-
-            const prNumber = Number(match[1]);
-
-            // Get the PR's HEAD SHA
-            const { data: pr } = await github.rest.pulls.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: prNumber
-            });
-
-            const sha = pr.head.sha;
-            core.info(`Reporting status to PR #${prNumber} commit ${sha}`);
-
-            // Map job status to commit status state
-            let state, description;
-            if (status === 'success') {
-              state = 'success';
-              description = 'Privileged CI tests passed';
-            } else if (status === 'cancelled') {
-              state = 'error';
-              description = 'Privileged CI tests were cancelled';
-            } else {
-              state = 'failure';
-              description = 'Privileged CI tests failed';
-            }
-
-            const runUrl = `${context.serverUrl}/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
-
-            // Create commit status
-            await github.rest.repos.createCommitStatus({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              sha: sha,
-              state: state,
-              context: 'pre-merge-tests',
-              description: description,
-              target_url: runUrl
-            });
-
-            core.info(`✅ Reported status '${state}' to commit ${sha}`);
-
-      - name: Clean up ci/pr-* branch
-        if: always()
-        run: |
-          REF="${GITHUB_REF}"
-          # Only delete if we're running on a ci/pr-* branch
-          if [[ "$REF" =~ ^refs/heads/ci/pr-[0-9]+$ ]]; then
-            BRANCH="${REF#refs/heads/}"
-            echo "Cleaning up temporary branch: $BRANCH"
-            # Delete the branch from remote (ignore errors if already deleted)
-            git push origin --delete "$BRANCH" 2>/dev/null || echo "Branch $BRANCH already deleted or not found"
-            echo "✓ Cleanup complete"
-          else
-            echo "Not a ci/pr-* branch (ref: $REF), skipping cleanup"
-          fi