Fix auto-merge CI trigger and remove label after PR close/merge (#5571)

## Summary
Fix GitHub CI trigger issue and clean up the `enable-auto-merge` label
when PRs are closed or merged.

## Changes
- Fix CI trigger issue that prevented auto-merge from detecting
nvfuser-ci completion
- Add `cleanup-label` job that removes label on any PR close event
- Add label removal in auto-merge job after successful merge
- Update auto-merge job condition to exclude `closed` events

## Why Both Label Removal Paths Are Needed
- **Auto-merge path**: Removes label when this workflow merges the PR
- **Cleanup-label path**: Removes label when PR is manually
merged/closed
- Due to GITHUB_TOKEN protection, the cleanup-label job won't trigger
when auto-merge closes a PR, so both are necessary

## Benefits
- Auto-merge now properly triggers when nvfuser-ci completes
- Prevents stale label if merged PRs are reopened
- Cleans up label regardless of merge method (auto vs manual)
- More efficient: cleanup-label only runs for PRs with the label

🤖 Generated with [Claude Code](https://claude.com/claude-code)

---------

Co-authored-by: Claude <[email protected]>

Author: xwang233

.github/workflows/auto-merge.yml

@@ -14,7 +14,9 @@ on:
   check_run:
     types:
       - completed
-  status: {}
+  repository_dispatch:
+    types:
+      - nvfuser-ci-success
 
 jobs:
   auto-merge:
@@ -32,7 +34,7 @@ jobs:
       (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'enable-auto-merge')) ||
       (github.event_name == 'pull_request_review' && github.event.review.state == 'approved' && contains(github.event.pull_request.labels.*.name, 'enable-auto-merge')) ||
       (github.event_name == 'check_run' && github.event.check_run.conclusion == 'success' && github.event.check_run.pull_requests[0] != null) ||
-      (github.event_name == 'status' && github.event.state == 'success' && github.event.context == 'nvfuser-ci')
+      (github.event_name == 'repository_dispatch' && github.event.action == 'nvfuser-ci-success')
 
     steps:
       - name: Get PR details
@@ -43,13 +45,27 @@ jobs:
             let pr;
             if (context.payload.pull_request) {
               pr = context.payload.pull_request;
+            } else if (context.eventName === 'repository_dispatch') {
+              // For repository_dispatch events, get PR number from client_payload
+              const pr_number = context.payload.client_payload.pr_number;
+              if (!pr_number) {
+                core.info('No PR number in repository_dispatch payload');
+                return { should_skip: true };
+              }
+
+              const { data } = await github.rest.pulls.get({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: pr_number,
+              });
+              pr = data;
             } else {
-              // For status/check_run events, we need to find the PR
+              // For check_run events, we need to find the PR
               const prs = await github.rest.pulls.list({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 state: 'open',
-                head: `${context.repo.owner}:${context.payload.check_run?.head_branch || context.payload.branches?.[0]?.name}`,
+                head: `${context.repo.owner}:${context.payload.check_run?.head_branch}`,
               });
 
               if (prs.data.length === 0) {
@@ -391,16 +407,31 @@ jobs:
               });
 
               core.info(`✅ Successfully merged PR #${pr_number}`);
+
+              // Remove the label after successful merge to prevent stale state
+              try {
+                await github.rest.issues.removeLabel({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  issue_number: pr_number,
+                  name: 'enable-auto-merge',
+                });
+                core.info('Removed enable-auto-merge label');
+              } catch (labelError) {
+                // Label might already be removed, ignore error
+                core.info(`Could not remove label (may already be removed): ${labelError.message}`);
+              }
             } catch (error) {
               core.setFailed(`Failed to merge PR: ${error.message}`);
 
               // Notify maintainers about the merge failure
               try {
+                const runUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
                 await github.rest.issues.createComment({
                   owner: context.repo.owner,
                   repo: context.repo.repo,
                   issue_number: pr_number,
-                  body: `⚠️ Auto-merge failed. Please review and merge manually. cc @xwang233`,
+                  body: `⚠️ Auto-merge failed. Please review and merge manually.\n\nWorkflow run: ${runUrl}\n\ncc @xwang233`,
                 });
                 core.info('Posted merge failure notification comment');
               } catch (commentError) {

.github/workflows/cleanup-auto-merge-label.yml

@@ -0,0 +1,41 @@
+# SPDX-FileCopyrightText: Copyright (c) 2023-present NVIDIA CORPORATION & AFFILIATES.
+# All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Remove enable-auto-merge label when PR is closed/merged
+name: Cleanup auto-merge label
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  cleanup-label:
+    name: Remove auto-merge label on PR close
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    permissions:
+      pull-requests: write
+
+    # Only run when a PR with the enable-auto-merge label is closed
+    if: contains(github.event.pull_request.labels.*.name, 'enable-auto-merge')
+
+    steps:
+      - name: Remove enable-auto-merge label
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const pr_number = context.payload.pull_request.number;
+
+            try {
+              await github.rest.issues.removeLabel({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: pr_number,
+                name: 'enable-auto-merge',
+              });
+              core.info(`Removed enable-auto-merge label from PR #${pr_number}`);
+            } catch (error) {
+              // Label might have been removed already, log but don't fail
+              core.info(`Could not remove label: ${error.message}`);
+            }

.github/workflows/upload-ci-logs-v2.yml

@@ -24,15 +24,17 @@ on:
         required: true
       pr_number:
         description: 'pr number'
-        required: false
+        required: true
 
-run-name: PR status ${{ inputs.pr_number || github.run_id }} - ${{ inputs.commit_sha }} - ${{ inputs.context }}
+run-name: PR status ${{ inputs.pr_number }} - ${{ inputs.commit_sha }} - ${{ inputs.context }}
 jobs:
   status_update:
     name: Update commit status
     runs-on: ubuntu-latest
     permissions:
       statuses: write
+      contents: write
+      pull-requests: read
     steps:
       - name: Set status
         run: |
@@ -47,3 +49,34 @@ jobs:
               \"description\":\"${{ inputs.descr }}\", \
               \"context\":\"${{ inputs.context }}\" \
             }"
+
+      - name: Trigger auto-merge check
+        if: inputs.context == 'nvfuser-ci' && inputs.state == 'success'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            // Check if PR has enable-auto-merge label
+            const { data: pr } = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: ${{ inputs.pr_number }},
+            });
+
+            const hasLabel = pr.labels.some(label => label.name === 'enable-auto-merge');
+            if (!hasLabel) {
+              core.info('PR does not have enable-auto-merge label, skipping auto-merge trigger');
+              return;
+            }
+
+            // Dispatch event to trigger auto-merge workflow
+            await github.rest.repos.createDispatchEvent({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              event_type: 'nvfuser-ci-success',
+              client_payload: {
+                pr_number: ${{ inputs.pr_number }},
+                commit_sha: '${{ inputs.commit_sha }}'
+              }
+            });
+
+            core.info(`Triggered auto-merge check for PR #${{ inputs.pr_number }}`);