From c298d8a8703c4f2bd82dba742d53511b10d89da9 Mon Sep 17 00:00:00 2001
From: Christian Byrne <cbyrne@comfy.org>
Date: Sun, 30 Nov 2025 18:27:04 -0800
Subject: [PATCH] [fix] Weekly release workflow adjustments (#7060)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Follow-up adjustments to the weekly ComfyUI release automation workflow.

## Changes

1. **Rename workflow to follow conventions**
   - File: `weekly-comfyui-release.yaml` → `release-weekly-comfyui.yaml`
   - Name: "Weekly ComfyUI Release" → "Release: Weekly ComfyUI"
   - Matches pattern of other `release-*` workflows

2. **Sync fork with upstream before creating PR**
   - Fetches latest upstream/master before making changes
   - Ensures PR only shows requirements.txt diff, not stale fork commits
- Does not modify fork's master branch (only pushes automation branch)

## Testing

After merge, can test via manual workflow dispatch in Actions tab.

┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-7060-fix-Weekly-release-workflow-adjustments-2bb6d73d365081008436d1b9e5f7dd65)
by [Unito](https://www.unito.io)
---
 ...lease.yaml => release-weekly-comfyui.yaml} | 24 ++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)
 rename .github/workflows/{weekly-comfyui-release.yaml => release-weekly-comfyui.yaml} (92%)

diff --git a/.github/workflows/weekly-comfyui-release.yaml b/.github/workflows/release-weekly-comfyui.yaml
similarity index 92%
rename from .github/workflows/weekly-comfyui-release.yaml
rename to .github/workflows/release-weekly-comfyui.yaml
index 41e6a4271..d763aa0f5 100644
--- a/.github/workflows/weekly-comfyui-release.yaml
+++ b/.github/workflows/release-weekly-comfyui.yaml
@@ -1,5 +1,5 @@
 # Automated weekly workflow to bump ComfyUI frontend RC releases
-name: "Weekly ComfyUI Release"
+name: "Release: Weekly ComfyUI"
 
 on:
   # Schedule for Monday at 12:00 PM PST (20:00 UTC)
@@ -143,6 +143,28 @@ jobs:
           token: ${{ secrets.PR_GH_TOKEN }}
           path: comfyui
 
+      - name: Sync with upstream
+        working-directory: comfyui
+        run: |
+          set -euo pipefail
+
+          # Fetch latest upstream to base our branch on fresh code
+          # Note: This only affects the local checkout, NOT the fork's master branch
+          # We only push the automation branch, leaving the fork's master untouched
+          echo "Fetching upstream master..."
+          if ! git fetch https://github.com/comfyanonymous/ComfyUI.git master; then
+            echo "Failed to fetch upstream master"
+            exit 1
+          fi
+
+          echo "Checking out upstream master..."
+          if ! git checkout FETCH_HEAD; then
+            echo "Failed to checkout FETCH_HEAD"
+            exit 1
+          fi
+
+          echo "Successfully synced with upstream master"
+
       - name: Update requirements.txt
         working-directory: comfyui
         run: |