feat: reuse release workflows for all bot interactions

Author: drbh

.github/scripts/dispatch_release.py

@@ -61,7 +61,15 @@ def github_api_request(
         return resp.status, resp.read().decode("utf-8")
 
 
-def run_local(workflow: str, kernel_name: str, *, skip_build: bool = False) -> bool:
+def run_local(
+    workflow: str,
+    kernel_name: str,
+    *,
+    skip_build: bool = False,
+    pr_number: str = "",
+    target_branch: str = "",
+    upload: bool = True,
+) -> bool:
     """Run a release workflow locally via act."""
     cmd = [
         "act", "workflow_dispatch",
@@ -71,6 +79,12 @@ def run_local(workflow: str, kernel_name: str, *, skip_build: bool = False) -> b
     ]
     if skip_build:
         cmd.extend(["--input", "skip_build=true"])
+    if pr_number:
+        cmd.extend(["--input", f"pr_number={pr_number}"])
+    if target_branch:
+        cmd.extend(["--input", f"target_branch={target_branch}"])
+    if not upload:
+        cmd.extend(["--input", "upload=false"])
     print(f"Running locally: {' '.join(cmd)}")
     result = subprocess.run(cmd)
     return result.returncode == 0
@@ -175,6 +189,9 @@ def dispatch_release(
     dispatch_key_prefix: str = "",
     local: bool = False,
     skip_build: bool = False,
+    pr_number: str = "",
+    target_branch: str = "",
+    upload: bool = True,
 ) -> ReleaseDispatchResult:
     """
     Dispatch the appropriate release workflows for a kernel.
@@ -185,6 +202,11 @@ def dispatch_release(
         repo: GitHub repository in "owner/repo" format.
         ref: Git ref to dispatch against (default "main").
         dispatch_key_prefix: Optional prefix for dispatch keys (e.g. "pr42-").
+        local: Run locally via act instead of remote dispatch.
+        skip_build: Skip build and upload steps.
+        pr_number: Optional PR number to checkout before building.
+        target_branch: Target branch for upload.
+        upload: Whether to upload after build.
 
     Returns:
         ReleaseDispatchResult with dispatched/failed/skipped lists.
@@ -208,7 +230,13 @@ def dispatch_release(
             f"{dispatch_key_prefix}{kernel_name}-{workflow}-{uuid.uuid4().hex[:12]}"
         )
         if local:
-            if run_local(workflow, kernel_name, skip_build=skip_build):
+            if run_local(
+                workflow, kernel_name,
+                skip_build=skip_build,
+                pr_number=pr_number,
+                target_branch=target_branch,
+                upload=upload,
+            ):
                 result.dispatched.append((workflow, dispatch_key))
             else:
                 result.failed.append((workflow, 0))
@@ -220,6 +248,12 @@ def dispatch_release(
             }
             if skip_build:
                 inputs["skip_build"] = "true"
+            if pr_number:
+                inputs["pr_number"] = pr_number
+            if target_branch:
+                inputs["target_branch"] = target_branch
+            if not upload:
+                inputs["upload"] = "false"
             dispatch_body = {
                 "ref": ref,
                 "inputs": inputs,
@@ -255,16 +289,35 @@ def main() -> int:
         "--skip-build", action="store_true",
         help="Skip build and upload steps (for testing workflow plumbing)",
     )
+    parser.add_argument(
+        "--pr-number", default="",
+        help="PR number to checkout before building",
+    )
+    parser.add_argument(
+        "--target-branch", default="",
+        help="Target branch for upload",
+    )
+    parser.add_argument(
+        "--no-upload", action="store_true",
+        help="Build only, do not upload",
+    )
     args = parser.parse_args()
 
+    common = dict(
+        skip_build=args.skip_build,
+        pr_number=args.pr_number,
+        target_branch=args.target_branch,
+        upload=not args.no_upload,
+    )
+
     if args.local:
         result = dispatch_release(
             args.kernel_name,
             token="",
             repo="",
             ref=args.ref,
             local=True,
-            skip_build=args.skip_build,
+            **common,
         )
     else:
         token = get_token()
@@ -288,7 +341,7 @@ def main() -> int:
             token=token,
             repo=repo,
             ref=args.ref,
-            skip_build=args.skip_build,
+            **common,
         )
 
     if result.dispatched:

.github/scripts/pr_comment_kernel_bot.py

@@ -24,7 +24,6 @@
 }
 FORK_BLOCKED_COMMANDS = {"build", "build-and-upload", "release"}
 MAX_COMMENT_LENGTH = 1024
-DISPATCH_WORKFLOW = "manual-build-upload.yaml"
 RUN_LOOKUP_ATTEMPTS = 10
 RUN_LOOKUP_SLEEP_SECONDS = 2
 RUN_LOOKUP_PAGE_SIZE = 100
@@ -222,7 +221,7 @@ def resolve_dispatch_run_urls(
         return
 
     if workflows is None:
-        workflows = [DISPATCH_WORKFLOW]
+        workflows = RELEASE_WORKFLOWS
 
     for attempt in range(RUN_LOOKUP_ATTEMPTS):
         for workflow in workflows:
@@ -295,7 +294,7 @@ def comment_base_lines(
     ]
     if pr_head_sha:
         lines.append(f"PR head SHA: `{pr_head_sha}`")
-    lines.append(f"Workflow: `{DISPATCH_WORKFLOW}`")
+    lines.append(f"Workflows: `{', '.join(RELEASE_WORKFLOWS)}`")
     return lines
 
 
@@ -543,27 +542,22 @@ def main():
             )
             return 0
 
-    dispatch_url = f"{api_base}/actions/workflows/{DISPATCH_WORKFLOW}/dispatches"
     if command == "build":
         target_branch = requested_branch or f"pr-{issue_number}"
         dispatch_pr_number = str(issue_number)
-        upload_flag = "false"
-        allow_main_dispatch = "false"
+        dispatch_upload = False
     elif command == "build-and-upload":
         target_branch = requested_branch or f"pr-{issue_number}"
         dispatch_pr_number = str(issue_number)
-        upload_flag = "true"
-        allow_main_dispatch = "false"
+        dispatch_upload = True
     elif command == "release":
-        target_branch = requested_branch or default_branch
+        target_branch = requested_branch or ""
         dispatch_pr_number = ""
-        upload_flag = "true"
-        allow_main_dispatch = "true"
-    else:
+        dispatch_upload = True
+    else:  # merge-and-upload
         target_branch = requested_branch or "main"
         dispatch_pr_number = ""
-        upload_flag = "true"
-        allow_main_dispatch = "true"
+        dispatch_upload = True
 
     mode_text = {
         "build": "build only",
@@ -658,55 +652,31 @@ def main():
     dispatches = []
     failed = []
 
-    if command == "release":
-        for kernel_name in kernels:
-            release_result = do_dispatch_release(
-                kernel_name,
-                token=token,
-                repo=repository,
-                ref=default_branch,
-                dispatch_key_prefix=f"pr{issue_number}-",
+    for kernel_name in kernels:
+        release_result = do_dispatch_release(
+            kernel_name,
+            token=token,
+            repo=repository,
+            ref=default_branch,
+            dispatch_key_prefix=f"pr{issue_number}-",
+            pr_number=dispatch_pr_number,
+            target_branch=target_branch,
+            upload=dispatch_upload,
+        )
+        for wf, dk in release_result.dispatched:
+            dispatches.append(
+                DispatchResult(kernel_name=f"{kernel_name} ({wf})", dispatch_key=dk)
             )
-            for wf, dk in release_result.dispatched:
-                dispatches.append(
-                    DispatchResult(kernel_name=f"{kernel_name} ({wf})", dispatch_key=dk)
-                )
-            for wf, code in release_result.failed:
-                failed.append((f"{kernel_name} ({wf})", code))
-    else:
-        for kernel_name in kernels:
-            dispatch_key = make_dispatch_key(issue_number, kernel_name)
-            dispatch_body = {
-                "ref": default_branch,
-                "inputs": {
-                    "kernel_name": kernel_name,
-                    "pr_number": dispatch_pr_number,
-                    "target_branch": target_branch,
-                    "upload": upload_flag,
-                    "allow_main_dispatch": allow_main_dispatch,
-                    "dispatch_key": dispatch_key,
-                },
-            }
-            try:
-                print(
-                    f"Dispatching workflow for command `{command}`, kernel `{kernel_name}`, branch `{target_branch}`"
-                )
-                github_api_request(dispatch_url, token, method="POST", data=dispatch_body)
-                dispatches.append(
-                    DispatchResult(kernel_name=kernel_name, dispatch_key=dispatch_key)
-                )
-            except urllib.error.HTTPError as e:
-                err_text = e.read().decode("utf-8", errors="replace")
-                print(err_text, file=sys.stderr)
-                failed.append((kernel_name, e.code))
+        for wf, code in release_result.failed:
+            failed.append((f"{kernel_name} ({wf})", code))
 
     resolve_dispatch_run_urls(
         api_base,
         token,
         repository,
         default_branch,
         dispatches,
-        workflows=RELEASE_WORKFLOWS if command == "release" else None,
+        workflows=RELEASE_WORKFLOWS,
     )
 
     comment_written = try_send_issue_comment(

.github/workflows/build-release-mac.yaml

@@ -17,6 +17,21 @@ on:
         required: false
         type: boolean
         default: false
+      pr_number:
+        description: "Optional PR number to checkout before building"
+        required: false
+        type: string
+        default: ""
+      target_branch:
+        description: "Target branch for upload (default: repo default)"
+        required: false
+        type: string
+        default: ""
+      upload:
+        description: "Whether to upload after build"
+        required: false
+        type: boolean
+        default: true
 concurrency:
   group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
@@ -25,7 +40,24 @@ jobs:
   build-kernel:
     runs-on: macos-26
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Validate PR number
+        if: inputs.pr_number != ''
+        run: |
+          case "${{ inputs.pr_number }}" in
+            ''|*[!0-9]*)
+              echo "Invalid pr_number input: must be numeric"
+              exit 1
+              ;;
+          esac
+      - name: Checkout PR branch
+        if: inputs.pr_number != ''
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          ref: refs/pull/${{ inputs.pr_number }}/head
+          fetch-depth: 0
+      - name: Checkout default branch
+        if: inputs.pr_number == ''
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - uses: DeterminateSystems/nix-installer-action@ef8a148080ab6020fd15196c2084a2eea5ff2d25 # v22
         with:
           extra-conf: |
@@ -58,16 +90,20 @@ jobs:
           KERNEL="${{ steps.validate.outputs.kernel }}"
           ( cd "$KERNEL" && nix build -L )
       - name: Upload kernel to Hub
-        if: steps.validate.outputs.skip == 'false' && inputs.skip_build != true
+        if: steps.validate.outputs.skip == 'false' && inputs.skip_build != true && inputs.upload != false
         env:
           HF_TOKEN: ${{ secrets.HF_TOKEN }}
         run: |
           KERNEL="${{ steps.validate.outputs.kernel }}"
           cd "$KERNEL"
-          nix run -L github:huggingface/kernels#kernel-builder -- upload --repo-type model --repo-id "kernels-community/$KERNEL"
-          nix run -L github:huggingface/kernels#kernel-builder -- upload --repo-type kernel --repo-id "kernels-community/$KERNEL"
+          BRANCH_FLAG=""
+          if [ -n "${{ inputs.target_branch }}" ]; then
+            BRANCH_FLAG="--branch ${{ inputs.target_branch }}"
+          fi
+          nix run -L github:huggingface/kernels#kernel-builder -- upload --repo-type model --repo-id "kernels-community/$KERNEL" $BRANCH_FLAG
+          nix run -L github:huggingface/kernels#kernel-builder -- upload --repo-type kernel --repo-id "kernels-community/$KERNEL" $BRANCH_FLAG
       - name: Upload v1 kernels to main
-        if: steps.validate.outputs.skip == 'false' && inputs.skip_build != true
+        if: steps.validate.outputs.skip == 'false' && inputs.skip_build != true && inputs.upload != false && inputs.target_branch == ''
         env:
           HF_TOKEN: ${{ secrets.HF_TOKEN }}
         run: |