From 4c685ee1e7fa8d55b28caf13aa00ac466a0cc280 Mon Sep 17 00:00:00 2001 From: Shawn Date: Wed, 15 Jan 2025 12:23:04 -0500 Subject: [PATCH 1/8] get version correctly --- docker/push-api-images | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/push-api-images b/docker/push-api-images index 293f378..4aca86a 100755 --- a/docker/push-api-images +++ b/docker/push-api-images @@ -6,7 +6,7 @@ comfy_version=${1:-0.3.10} torch_version=${2:-2.5.0} cuda_version=${3:-12.1} -current_api_version=$(cat package.json | jq -r '.version') +current_api_version=$(cat ../package.json | jq -r '.version') api_version=${4:-$current_api_version} bases=("runtime" "devel") From 95ac9e3890c63bf4644ebe34f5bd0d42a96324ed Mon Sep 17 00:00:00 2001 From: Shawn Date: Wed, 15 Jan 2025 12:24:58 -0500 Subject: [PATCH 2/8] don't create releases for changes in docker dir --- .github/workflows/create-release.yml | 1 + .github/workflows/pr-build.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index f97f44c..2f6f174 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -13,6 +13,7 @@ on: - "**.yml" - "test/**" - "example-workflows/**" + - "docker/**" workflow_dispatch: {} jobs: diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index e4f3d28..1d607d3 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -11,6 +11,7 @@ on: - "generate-workflow" - "test/**" - "example-workflows/**" + - "docker/**" jobs: build: From cdafaca0216ccbf1d1bd100682777a55720d6c8c Mon Sep 17 00:00:00 2001 From: Shawn Date: Wed, 15 Jan 2025 12:31:38 -0500 Subject: [PATCH 3/8] multi-line syntax in release creation --- .github/workflows/create-release.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 2f6f174..48d2069 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -44,8 +44,16 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | info=$(gh pr list --state merged --limit 1 --json title,body | jq -r '.[0]') - echo "title=$(echo $info | jq '.title')" >> "$GITHUB_OUTPUT" - echo "body=$(echo $info | jq '.body')" >> "$GITHUB_OUTPUT" + { + echo 'title<> "$GITHUB_OUTPUT" + { + echo 'body<> "$GITHUB_OUTPUT" - name: Create a release uses: actions/create-release@v1 From 06cf63457a15d94127d072845b6a8ecae5ae0ea0 Mon Sep 17 00:00:00 2001 From: Shawn Date: Wed, 15 Jan 2025 12:32:25 -0500 Subject: [PATCH 4/8] allow manually running docker build --- .github/workflows/build-docker-images.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml index dec5eef..d1b8d9e 100644 --- a/.github/workflows/build-docker-images.yml +++ b/.github/workflows/build-docker-images.yml @@ -4,9 +4,10 @@ on: release: types: - published + workflow_dispatch: {} jobs: - build: + build-and-push: runs-on: ubuntu-latest steps: From 1a88169ddf45b4ae14ab31dabc6fc021c15e5e1d Mon Sep 17 00:00:00 2001 From: Shawn Date: Wed, 15 Jan 2025 16:36:10 -0500 Subject: [PATCH 5/8] permissions for the job --- .github/workflows/build-docker-images.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build-docker-images.yml b/.github/workflows/build-docker-images.yml index d1b8d9e..009af06 100644 --- a/.github/workflows/build-docker-images.yml +++ b/.github/workflows/build-docker-images.yml @@ -8,6 +8,9 @@ on: jobs: build-and-push: + permissions: + contents: read + packages: write runs-on: ubuntu-latest steps: From 504279aed4edb41a046d0c5bb859e0f714ab6e09 Mon Sep 17 00:00:00 2001 From: Shawn Date: Wed, 15 Jan 2025 16:38:56 -0500 Subject: [PATCH 6/8] more accurate name --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 48d2069..37b74de 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -38,7 +38,7 @@ jobs: id: version run: echo "version=$(jq -r .version package.json)" >> "$GITHUB_OUTPUT" - - name: Get the PR that was merged into main + - name: Get the title and body from the last merged PR id: pr-output env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} From 7d9d90576c77c44b772c54d86b8fed00984498a3 Mon Sep 17 00:00:00 2001 From: Shawn Date: Wed, 15 Jan 2025 16:42:26 -0500 Subject: [PATCH 7/8] publish runtime second --- docker/push-api-images | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/push-api-images b/docker/push-api-images index 4aca86a..b40a26a 100755 --- a/docker/push-api-images +++ b/docker/push-api-images @@ -9,7 +9,7 @@ cuda_version=${3:-12.1} current_api_version=$(cat ../package.json | jq -r '.version') api_version=${4:-$current_api_version} -bases=("runtime" "devel") +bases=("devel" "runtime") for base in "${bases[@]}"; do docker push ghcr.io/saladtechnologies/comfyui-api:comfy$comfy_version-api$api_version-torch$torch_version-cuda$cuda_version-$base From 4cd940d4373f3edaae758a8c221a288dce81b5dd Mon Sep 17 00:00:00 2001 From: Shawn Date: Wed, 15 Jan 2025 17:27:41 -0500 Subject: [PATCH 8/8] fix typo --- .github/workflows/create-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 37b74de..f0650ca 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -51,7 +51,7 @@ jobs: } >> "$GITHUB_OUTPUT" { echo 'body<> "$GITHUB_OUTPUT"