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 41e6a4271e..d763aa0f50 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: |