mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-05-02 04:02:20 +00:00
39d81834d4
- Merge latest main to resolve conflicts
- Fix asset browser filtering: pass target input name (e.g.,
'ckpt_name') instead of PrimitiveNode's widget name ('value')
**Changes:**
- Add `inputNameForBrowser` param to `createAssetWidget`
- Pass `targetInputName` from `PrimitiveNode._createAssetWidget`
┆Issue is synchronized with this [Notion
page](https://www.notion.so/PR-8596-fix-merge-main-and-pass-target-input-name-to-asset-browser-2fd6d73d36508112bb17cf5d3fe54687)
by [Unito](https://www.unito.io)
---------
Co-authored-by: Subagent 5 <subagent@example.com>
Co-authored-by: Amp <amp@ampcode.com>
Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: guill <jacob.e.segal@gmail.com>
Co-authored-by: Jin Yi <jin12cc@gmail.com>
Co-authored-by: Alexander Brown <drjkl@comfy.org>
Co-authored-by: AustinMroz <austin@comfy.org>
Co-authored-by: Comfy Org PR Bot <snomiao+comfy-pr@gmail.com>
Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Johnpaul Chiwetelu <49923152+Myestery@users.noreply.github.com>
Co-authored-by: Rizumu Ayaka <rizumu@ayaka.moe>
Co-authored-by: Kelly Yang <124ykl@gmail.com>
Co-authored-by: sno <snomiao@gmail.com>
Co-authored-by: Claude Sonnet 4.5 <noreply@anthropic.com>
Co-authored-by: Benjamin Lu <benjaminlu1107@gmail.com>
Co-authored-by: Terry Jia <terryjia88@gmail.com>
Co-authored-by: Luke Mino-Altherr <luke@comfy.org>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
95 lines
3.2 KiB
YAML
95 lines
3.2 KiB
YAML
name: Version Bump Desktop UI
|
|
|
|
on:
|
|
workflow_dispatch:
|
|
inputs:
|
|
version_type:
|
|
description: 'Version increment type'
|
|
required: true
|
|
default: 'patch'
|
|
type: 'choice'
|
|
options: [patch, minor, major, prepatch, preminor, premajor, prerelease]
|
|
pre_release:
|
|
description: Pre-release ID (suffix)
|
|
required: false
|
|
default: ''
|
|
type: string
|
|
branch:
|
|
description: 'Base branch to bump (e.g., main, core/1.29, core/1.30)'
|
|
required: true
|
|
default: 'main'
|
|
type: string
|
|
|
|
jobs:
|
|
bump-version-desktop-ui:
|
|
runs-on: ubuntu-latest
|
|
permissions:
|
|
contents: write
|
|
pull-requests: write
|
|
|
|
steps:
|
|
- name: Checkout repository
|
|
uses: actions/checkout@v6
|
|
with:
|
|
ref: ${{ github.event.inputs.branch }}
|
|
fetch-depth: 0
|
|
persist-credentials: false
|
|
|
|
- name: Validate branch exists
|
|
run: |
|
|
BRANCH="${{ github.event.inputs.branch }}"
|
|
if ! git show-ref --verify --quiet "refs/heads/$BRANCH" && ! git show-ref --verify --quiet "refs/remotes/origin/$BRANCH"; then
|
|
echo "❌ Branch '$BRANCH' does not exist"
|
|
echo ""
|
|
echo "Available core branches:"
|
|
git branch -r | grep 'origin/core/' | sed 's/.*origin\// - /' || echo " (none found)"
|
|
echo ""
|
|
echo "Main branch:"
|
|
echo " - main"
|
|
exit 1
|
|
fi
|
|
echo "✅ Branch '$BRANCH' exists"
|
|
|
|
- name: Install pnpm
|
|
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
|
|
with:
|
|
version: 10
|
|
|
|
- name: Setup Node.js
|
|
uses: actions/setup-node@v6
|
|
with:
|
|
node-version: '24.x'
|
|
cache: 'pnpm'
|
|
|
|
- name: Bump desktop-ui version
|
|
id: bump-version
|
|
env:
|
|
VERSION_TYPE: ${{ github.event.inputs.version_type }}
|
|
PRE_RELEASE: ${{ github.event.inputs.pre_release }}
|
|
run: |
|
|
pnpm -C apps/desktop-ui version "$VERSION_TYPE" --preid "$PRE_RELEASE" --no-git-tag-version
|
|
NEW_VERSION=$(node -p "require('./apps/desktop-ui/package.json').version")
|
|
echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_OUTPUT
|
|
|
|
- name: Format PR string
|
|
id: capitalised
|
|
env:
|
|
VERSION_TYPE: ${{ github.event.inputs.version_type }}
|
|
run: |
|
|
echo "capitalised=${VERSION_TYPE@u}" >> $GITHUB_OUTPUT
|
|
|
|
- name: Create Pull Request
|
|
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8.1.0
|
|
with:
|
|
token: ${{ secrets.PR_GH_TOKEN }}
|
|
commit-message: '[release] Increment desktop-ui to ${{ steps.bump-version.outputs.NEW_VERSION }}'
|
|
title: desktop-ui ${{ steps.bump-version.outputs.NEW_VERSION }}
|
|
body: |
|
|
${{ steps.capitalised.outputs.capitalised }} version increment for @comfyorg/desktop-ui to ${{ steps.bump-version.outputs.NEW_VERSION }}
|
|
|
|
**Base branch:** `${{ github.event.inputs.branch }}`
|
|
branch: desktop-ui-version-bump-${{ steps.bump-version.outputs.NEW_VERSION }}
|
|
base: ${{ github.event.inputs.branch }}
|
|
labels: |
|
|
Release
|