mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-04-28 10:12:11 +00:00
5869b04e57
## Summary Merges latest changes from `main` as of 10-06-2025. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-5965-Merge-main-as-of-10-06-2025-into-rh-test-2856d73d3650812cb95fd8917278a770) by [Unito](https://www.unito.io) --------- Signed-off-by: Marcel Petrick <mail@marcelpetrick.it> Co-authored-by: filtered <176114999+webfiltered@users.noreply.github.com> Co-authored-by: Christian Byrne <cbyrne@comfy.org> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Alexander Brown <drjkl@comfy.org> Co-authored-by: Benjamin Lu <benceruleanlu@proton.me> Co-authored-by: Terry Jia <terryjia88@gmail.com> Co-authored-by: snomiao <snomiao@gmail.com> Co-authored-by: Simula_r <18093452+simula-r@users.noreply.github.com> Co-authored-by: Jake Schroeder <jake.schroeder@isophex.com> Co-authored-by: Comfy Org PR Bot <snomiao+comfy-pr@gmail.com> Co-authored-by: AustinMroz <4284322+AustinMroz@users.noreply.github.com> Co-authored-by: GitHub Action <action@github.com> Co-authored-by: Johnpaul Chiwetelu <49923152+Myestery@users.noreply.github.com> Co-authored-by: Marcel Petrick <mail@marcelpetrick.it> Co-authored-by: Alexander Brown <DrJKL0424@gmail.com> Co-authored-by: Benjamin Lu <benjaminlu1107@gmail.com> Co-authored-by: Alexander Piskun <13381981+bigcat88@users.noreply.github.com> Co-authored-by: Rizumu Ayaka <rizumu@ayaka.moe> Co-authored-by: JakeSchroeder <jake@axiom.co> Co-authored-by: AustinMroz <austin@comfy.org> Co-authored-by: DrJKL <DrJKL@users.noreply.github.com> Co-authored-by: ComfyUI Wiki <contact@comfyui-wiki.com>
60 lines
1.7 KiB
YAML
60 lines
1.7 KiB
YAML
name: Publish Desktop UI on PR Merge
|
|
|
|
on:
|
|
pull_request:
|
|
types: [ closed ]
|
|
branches: [ main, core/* ]
|
|
paths:
|
|
- 'apps/desktop-ui/package.json'
|
|
|
|
jobs:
|
|
resolve:
|
|
name: Resolve Version and Dist Tag
|
|
runs-on: ubuntu-latest
|
|
if: >
|
|
github.event.pull_request.merged == true &&
|
|
contains(github.event.pull_request.labels.*.name, 'Release')
|
|
outputs:
|
|
version: ${{ steps.get_version.outputs.version }}
|
|
dist_tag: ${{ steps.dist.outputs.dist_tag }}
|
|
steps:
|
|
- name: Checkout code
|
|
uses: actions/checkout@v5
|
|
with:
|
|
ref: ${{ github.event.pull_request.merge_commit_sha }}
|
|
persist-credentials: false
|
|
|
|
- name: Setup Node.js
|
|
uses: actions/setup-node@v5
|
|
with:
|
|
node-version: '24.x'
|
|
|
|
- name: Read desktop-ui version
|
|
id: get_version
|
|
run: |
|
|
VERSION=$(node -p "require('./apps/desktop-ui/package.json').version")
|
|
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
|
|
|
- name: Determine dist-tag
|
|
id: dist
|
|
env:
|
|
VERSION: ${{ steps.get_version.outputs.version }}
|
|
run: |
|
|
if [[ "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+- ]]; then
|
|
echo "dist_tag=next" >> $GITHUB_OUTPUT
|
|
else
|
|
echo "dist_tag=latest" >> $GITHUB_OUTPUT
|
|
fi
|
|
|
|
publish:
|
|
name: Publish Desktop UI to npm
|
|
needs: resolve
|
|
uses: ./.github/workflows/publish-desktop-ui.yaml
|
|
with:
|
|
version: ${{ needs.resolve.outputs.version }}
|
|
dist_tag: ${{ needs.resolve.outputs.dist_tag }}
|
|
ref: ${{ github.event.pull_request.merge_commit_sha }}
|
|
secrets:
|
|
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
|
|
|