Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
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
  • Loading branch information
christian-byrne committed Nov 30, 2025
commit 19d08c2029497bc6705942ac5dfc211312440c76
17 changes: 15 additions & 2 deletions .github/workflows/release-weekly-comfyui.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down