fix: improve publish workflow git setup and validation (#268)

Author: christian-byrne

.github/workflows/lint.yml

@@ -0,0 +1,25 @@
+name: Lint
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  yaml-lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+
+      - name: Install YAML linter
+        run: npm install -g yaml-lint
+
+      - name: Lint YAML files
+        run: yamllint .github/workflows/*.{yml,yaml}

.github/workflows/publish.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          fetch-depth: 2
+          fetch-depth: 0  # Full history needed for tags and version comparison
 
       - name: Check if version actually changed
         id: check
@@ -41,6 +41,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Full history needed for tags and bump_versions.py
 
       - name: Set up Node.js
         uses: actions/setup-node@v4
@@ -70,13 +72,17 @@ jobs:
       - name: Auto-bump package versions based on changes
         run: |
           source .venv/bin/activate
-          python scripts/bump_versions.py
+          PREV_TAG=$(git tag --sort=-version:refname | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' | head -1)
+          if [ -z "$PREV_TAG" ]; then
+            python scripts/bump_versions.py --base-ref HEAD~1
+          else
+            python scripts/bump_versions.py --base-ref "$PREV_TAG"
+          fi
 
       - name: Determine changed packages
         id: changed-packages
         run: |
           source .venv/bin/activate
-          # Get packages that were just bumped by bump_versions.py
           CHANGED_OUTPUT=$(python scripts/bump_versions.py --dry-run 2>/dev/null || echo "")
           
           # Extract package names from bump_versions.py output

.yamllint.yml

@@ -0,0 +1,7 @@
+extends: default
+
+rules:
+  line-length:
+    max: 200  # Allow longer lines in YAML files
+  document-start: disable  # Don't require --- at start
+  truthy: disable  # Allow on/off instead of true/false

README.md

@@ -371,32 +371,23 @@ Raw markdown used:
 > [Wan 2.1 Tutorial - docs.comfy.org](https://docs.comfy.org/tutorials/video/wan/wan-video) — Explanation of concepts and step-by-step tutorial
 ```
 
-### 12 — Bump Version and Create PR
-
-Run the automated version helper before opening your PR. It looks at the latest git tag
-and bumps only the packages that changed (plus updates dependency pins):
-
-```bash
-./scripts/bump_versions.py --dry-run   # optional preview
-./scripts/bump_versions.py
-```
-
-Then run the full validation script (which regenerates manifests, runs lint/tests, and
-builds wheels):
-
-```bash
-./run_full_validation.sh
-```
+### 12 — Create PR
 
 1. Fully test the workflow: delete the models, input images, etc. and try it as a new user would. Ensure the process has no hiccups and you can generate the thumbnail image on the first execution (if applicable).
 2. Create a fork of https://github.com/Comfy-Org/workflow_templates (or just checkout a new branch if you are a Comfy-Org collaborator)
 3. Clone the fork to your system (if not a collaborator)
 4. Copy your new workflow and thumbnail(s) into the `templates` folder
 5. Add your changes to the `templates/index.json` file
-6. Bump the version in `pyproject.toml` ([example](https://github.com/Comfy-Org/workflow_templates/pull/32))
+6. **Bump the version in the root `pyproject.toml`** ([example](https://github.com/Comfy-Org/workflow_templates/pull/32))
 7. Commit and push changes
 8. Create a PR on https://github.com/Comfy-Org/workflow_templates
 
+Version bumping and package building are automated via CI/CD. Bumping the root `pyproject.toml` version automatically:
+- Detects which subpackages have changed since their last release
+- Bumps versions only for affected packages
+- Updates all dependency references
+- Builds and publishes packages to PyPI
+
 Here is the PR I made for the Wan template: https://github.com/Comfy-Org/workflow_templates/pull/16
 
 Once the PR is merged, if you followed step 6 correctly, a new version will be published to the [comfyui-workflow-templates PyPi package](https://pypi.org/project/comfyui-workflow-templates).

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "comfyui_workflow_templates"
-version = "0.3.5"
+version = "0.3.6"
 description = "ComfyUI workflow templates package"
 readme = "README.md"
 requires-python = ">=3.9"

scripts/bump_versions.py

@@ -127,6 +127,29 @@ def git_changed_files(base_ref: str) -> List[str]:
     return [line.strip() for line in out.splitlines() if line.strip()]
 
 
+def get_last_pyproject_commit(pyproject_path: str) -> str:
+    """Find the last commit that modified a specific pyproject.toml file."""
+    try:
+        out = run_git(["log", "-1", "--format=%H", "--", pyproject_path])
+        return out.strip()
+    except subprocess.CalledProcessError:
+        return "HEAD~1"  # fallback if no history found
+
+
+def git_changed_files_since_package_release(pkg: str, cfg: PackageConfig) -> List[str]:
+    """Get changed files for a package since its last pyproject.toml change."""
+    # Find the last commit that changed this package's pyproject.toml
+    pyproject_path = str(cfg.pyproject_paths[0].relative_to(ROOT))
+    last_commit = get_last_pyproject_commit(pyproject_path)
+    
+    # Get all changes since that commit
+    try:
+        out = run_git(["diff", f"{last_commit}..HEAD", "--name-only"])
+        return [line.strip() for line in out.splitlines() if line.strip()]
+    except subprocess.CalledProcessError:
+        return []
+
+
 def load_bundles_from_git(ref: str) -> Mapping[str, List[str]]:
     try:
         raw = run_git(["show", f"{ref}:bundles.json"])
@@ -197,10 +220,32 @@ def packages_changed_from_paths(changed_files: Iterable[str]) -> Set[str]:
 
 
 def packages_to_bump(base_ref: str) -> Set[str]:
-    changed = git_changed_files(base_ref)
-    affected = packages_changed_from_paths(changed)
-    affected |= detect_template_asset_changes(changed)
-    affected |= detect_bundle_changes(base_ref)
+    """Determine which packages need version bumps based on changes since their last release."""
+    affected = set()
+    
+    # Check each package individually against its own last pyproject change
+    for pkg, cfg in PACKAGE_CONFIGS.items():
+            
+        # Get changes since this package's last pyproject.toml modification
+        changed_files = git_changed_files_since_package_release(pkg, cfg)
+        
+        # Check if this package's files changed
+        pkg_affected = packages_changed_from_paths(changed_files)
+        if pkg in pkg_affected:
+            affected.add(pkg)
+            continue
+            
+        # Check template asset changes for this package
+        template_affected = detect_template_asset_changes(changed_files)
+        if pkg in template_affected:
+            affected.add(pkg)
+            continue
+            
+        # Check bundle changes (this still needs global base_ref for bundles.json comparison)
+        if base_ref:
+            bundle_affected = detect_bundle_changes(base_ref)
+            if pkg in bundle_affected:
+                affected.add(pkg)
 
     # If any of the component bundles changed, make sure meta gets bumped too
     if affected & {"core", "media_api", "media_image", "media_other", "media_video"}: