From eae04df141dc0205c21a2ce0345ce6e51a23dfb0 Mon Sep 17 00:00:00 2001 From: bymyself Date: Sun, 30 Nov 2025 12:12:30 -0800 Subject: [PATCH 1/3] Rename workflow to follow release naming conventions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Rename file: weekly-comfyui-release.yaml → release-weekly-comfyui.yaml - Update name: "Weekly ComfyUI Release" → "Release: Weekly ComfyUI" - Follows pattern of other release-* workflows --- ...{weekly-comfyui-release.yaml => release-weekly-comfyui.yaml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{weekly-comfyui-release.yaml => release-weekly-comfyui.yaml} (99%) diff --git a/.github/workflows/weekly-comfyui-release.yaml b/.github/workflows/release-weekly-comfyui.yaml similarity index 99% rename from .github/workflows/weekly-comfyui-release.yaml rename to .github/workflows/release-weekly-comfyui.yaml index 41e6a4271ec..9c81a9926fe 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) From f551bfc6619906eca01436712e7edcbf22c98bb9 Mon Sep 17 00:00:00 2001 From: bymyself Date: Sun, 30 Nov 2025 13:32:01 -0800 Subject: [PATCH 2/3] Sync fork with upstream before creating PR branch - Fetch latest upstream/master before making changes - Ensures PR only shows requirements.txt diff, not stale commits - Does not modify fork's master branch (only pushes automation branch) --- .github/workflows/release-weekly-comfyui.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/release-weekly-comfyui.yaml b/.github/workflows/release-weekly-comfyui.yaml index 9c81a9926fe..0cbed2e39b2 100644 --- a/.github/workflows/release-weekly-comfyui.yaml +++ b/.github/workflows/release-weekly-comfyui.yaml @@ -143,6 +143,15 @@ jobs: token: ${{ secrets.PR_GH_TOKEN }} path: comfyui + - name: Sync with upstream + working-directory: comfyui + run: | + # 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 + git fetch https://github.com/comfyanonymous/ComfyUI.git master + git checkout FETCH_HEAD + - name: Update requirements.txt working-directory: comfyui run: | From 19d08c2029497bc6705942ac5dfc211312440c76 Mon Sep 17 00:00:00 2001 From: bymyself Date: Sun, 30 Nov 2025 14:08:29 -0800 Subject: [PATCH 3/3] Add error handling to upstream sync step - Enable strict mode with set -euo pipefail - Check exit status of git fetch and checkout - Log clear error messages on failure - Prevents subsequent steps from running on stale checkout --- .github/workflows/release-weekly-comfyui.yaml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-weekly-comfyui.yaml b/.github/workflows/release-weekly-comfyui.yaml index 0cbed2e39b2..d763aa0f509 100644 --- a/.github/workflows/release-weekly-comfyui.yaml +++ b/.github/workflows/release-weekly-comfyui.yaml @@ -146,11 +146,24 @@ jobs: - 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 - git fetch https://github.com/comfyanonymous/ComfyUI.git master - git checkout FETCH_HEAD + 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