Merge branch 'main' into feature/docker-builds

Author: hjpotter92

.github/workflows/release.yaml

@@ -6,15 +6,10 @@ on:
       - main
     tags:
       - "v*"
-  pull_request:
-    # types: [closed]
-    branches:
-      - main
 
 jobs:
   release:
     runs-on: ubuntu-latest
-    # if: ${{ github.event.pull_request.merged }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -26,21 +21,21 @@ jobs:
           cache-dependency-path: ui/package-lock.json
 
       - name: Build project
+        id: build
         env:
           "NEXT_PUBLIC_DEV": "false"
         run: |
+          dist_file_suffix="${{ github.ref_type == 'tag' && github.ref_name || github.event.pull_request.head.sha || github.sha }}"
           mkdir -p releases/
           cur_dir="$(pwd)"
           cd ui/
           npm ci
           npm run build
           dist_dir="../nodes/web/static/"
-          if ! [ test -d "${dist_dir}" ];
-          then
-            dist_dir="./.next/";
-          fi
           cd "$dist_dir"
-          zip -DTr9q "${cur_dir}/releases/dist.zip" ./
+          dist_file_full="${cur_dir}/releases/comfystream-uikit-${dist_file_suffix}.zip"
+          zip -DTr9q "${dist_file_full}" ./
+          echo "dist_file=${dist_file_full}" >> $GITHUB_OUTPUT
           cd -
 
       - name: Upload artifacts
@@ -49,21 +44,10 @@ jobs:
           name: release-artifacts
           path: releases/
 
-      - uses: actions-ecosystem/action-regex-match@v2
-        id: match-tag
-        with:
-          text: ${{ github.event.workflow_run.head_branch }}
-          regex: '^v([0-9]+\.\d+\.\d+)$'
-
       - name: Create release
-        if: ${{ steps.match-tag.outputs.match != '' }}
+        if: ${{ github.ref_type == 'tag' }}
         uses: softprops/action-gh-release@v2
         with:
-          files: |
-            dist.zip
-          tag_name: v${{ steps.current_version.outputs.version }}
-          target_commitish: ${{ github.event.pull_request.base.ref }}
-          make_latest: ${{ github.event.pull_request.base.ref == 'main' }}
-          draft: true
-          prerelease: false
+          files: ${{ steps.build.outputs.dist_file }}
+          make_latest: true
           generate_release_notes: true

nodes/web/static/.gitignore

@@ -0,0 +1,2 @@
+# Ignore every file in this folder
+!.gitignore

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "comfystream"
 description = "Build Live AI Video with ComfyUI"
-version = "0.0.2"
+version = "0.0.3"
 license = { file = "LICENSE" }
 dependencies = [
     "asyncio",
@@ -23,8 +23,8 @@ dev = ["pytest"]
 repository = "https://github.com/yondonfu/comfystream"
 
 [tool.comfy]
-PublisherId = "" # TODO (fill in Publisher ID from Comfy Registry Website).
-DisplayName = "ComfyStream" # Display name for the Custom Node. Can be changed later.
+PublisherId = "livepeer-comfystream"
+DisplayName = "ComfyStream"
 Icon = "https://avatars.githubusercontent.com/u/25355022?s=48&v=4" # SVG, PNG, JPG or GIF (MAX. 800x400px)
 
 [tool.setuptools]

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ui",
-  "version": "0.1.0",
+  "version": "0.0.3",
   "private": true,
   "scripts": {
     "dev": "cross-env NEXT_PUBLIC_DEV=true next dev",