From 4f5f895b2cc8bf3c6694996b5c3b1128516507cb Mon Sep 17 00:00:00 2001 From: Yoland Y <4950057+yoland68@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:38:32 -0700 Subject: [PATCH 1/6] Add win test workflow (WIP) --- .github/workflows/win-os-test.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/win-os-test.yml diff --git a/.github/workflows/win-os-test.yml b/.github/workflows/win-os-test.yml new file mode 100644 index 000000000..b51ebce01 --- /dev/null +++ b/.github/workflows/win-os-test.yml @@ -0,0 +1,30 @@ +name: Test ComfyUI Windows with Default Workflow +on: + pull_request: + branches: + - main + paths-ignore: + - 'tests/**' + - 'tests-ui/**' + - '.github/workflows/win-os-test.yml' + push: + paths-ignore: + - 'tests/**' + - 'tests-ui/**' + - '.github/workflows/win-os-test.yml' + workflow_dispatch: + + +jobs: + test-action: + runs-on: Windows + steps: + - name: Use ComfyUI GitHub Action + uses: drip-art/comfy-action@yo-win-action + with: + os: windows + cuda_version: 12.1 + torch_ver: 'stable' + models-json: '{"v1-5-pruned-emaonly.ckpt": {"url": "https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt", "directory": "checkpoints"}}' + workflow_json_path: '.github/workflows/json_examples/workflow_api.json' + timeout: 50 From d6fd187b6d0321a739b1a3bc17bc6ea4fb48a96b Mon Sep 17 00:00:00 2001 From: Yoland Y <4950057+yoland68@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:48:02 -0700 Subject: [PATCH 2/6] Ignore everything else besides itself --- .github/workflows/linux-os-test.yml | 18 ++++++++++-------- .github/workflows/mac-os-test.yml | 6 ++++-- .github/workflows/win-os-test.yml | 6 ++++-- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/linux-os-test.yml b/.github/workflows/linux-os-test.yml index 083b617a3..3f1858fd4 100644 --- a/.github/workflows/linux-os-test.yml +++ b/.github/workflows/linux-os-test.yml @@ -3,15 +3,17 @@ on: pull_request: branches: - main - paths-ignore: - - 'tests/**' - - 'tests-ui/**' - - '.github/workflows/mac-os-test.yml' + paths-ignore: + - "tests/**" + - "tests-ui/**" + - ".github/workflows/**" + - "!.github/workflows/linux-os-test.yml" push: - paths-ignore: - - 'tests/**' - - 'tests-ui/**' - - '.github/workflows/mac-os-test.yml' + paths-ignore: + - "tests/**" + - "tests-ui/**" + - ".github/workflows/**" + - "!.github/workflows/linux-os-test.yml" workflow_dispatch: diff --git a/.github/workflows/mac-os-test.yml b/.github/workflows/mac-os-test.yml index b133a2b89..52720e68f 100644 --- a/.github/workflows/mac-os-test.yml +++ b/.github/workflows/mac-os-test.yml @@ -7,12 +7,14 @@ on: paths-ignore: - 'tests/**' - 'tests-ui/**' - - '.github/workflows/linux-os-test.yml' + - ".github/workflows/**" + - "!.github/workflows/mac-os-test.yml" push: paths-ignore: - 'tests/**' - 'tests-ui/**' - - '.github/workflows/linux-os-test.yml' + - ".github/workflows/**" + - "!.github/workflows/mac-os-test.yml" workflow_dispatch: diff --git a/.github/workflows/win-os-test.yml b/.github/workflows/win-os-test.yml index b51ebce01..7c0941bb0 100644 --- a/.github/workflows/win-os-test.yml +++ b/.github/workflows/win-os-test.yml @@ -6,12 +6,14 @@ on: paths-ignore: - 'tests/**' - 'tests-ui/**' - - '.github/workflows/win-os-test.yml' + - ".github/workflows/**" + - "!.github/workflows/win-os-test.yml" push: paths-ignore: - 'tests/**' - 'tests-ui/**' - - '.github/workflows/win-os-test.yml' + - ".github/workflows/**" + - "!.github/workflows/win-os-test.yml" workflow_dispatch: From 1390f9d7d072c94e201d883d4acf182d6c68ce68 Mon Sep 17 00:00:00 2001 From: Yoland Y <4950057+yoland68@users.noreply.github.com> Date: Tue, 2 Apr 2024 15:53:09 -0700 Subject: [PATCH 3/6] Add condition to only trigger on push to master and PR to master --- .github/workflows/linux-os-test.yml | 4 +++- .github/workflows/mac-os-test.yml | 4 +++- .github/workflows/win-os-test.yml | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux-os-test.yml b/.github/workflows/linux-os-test.yml index 3f1858fd4..e61bc5e45 100644 --- a/.github/workflows/linux-os-test.yml +++ b/.github/workflows/linux-os-test.yml @@ -2,13 +2,15 @@ name: Test ComfyUI Linux with Default Workflow on: pull_request: branches: - - main + - master paths-ignore: - "tests/**" - "tests-ui/**" - ".github/workflows/**" - "!.github/workflows/linux-os-test.yml" push: + branches: + - master paths-ignore: - "tests/**" - "tests-ui/**" diff --git a/.github/workflows/mac-os-test.yml b/.github/workflows/mac-os-test.yml index 52720e68f..524bc61fc 100644 --- a/.github/workflows/mac-os-test.yml +++ b/.github/workflows/mac-os-test.yml @@ -3,13 +3,15 @@ name: Test ComfyUI Mac With Default Workflow on: pull_request: branches: - - main + - master paths-ignore: - 'tests/**' - 'tests-ui/**' - ".github/workflows/**" - "!.github/workflows/mac-os-test.yml" push: + branches: + - master paths-ignore: - 'tests/**' - 'tests-ui/**' diff --git a/.github/workflows/win-os-test.yml b/.github/workflows/win-os-test.yml index 7c0941bb0..65ccbd937 100644 --- a/.github/workflows/win-os-test.yml +++ b/.github/workflows/win-os-test.yml @@ -2,13 +2,15 @@ name: Test ComfyUI Windows with Default Workflow on: pull_request: branches: - - main + - master paths-ignore: - 'tests/**' - 'tests-ui/**' - ".github/workflows/**" - "!.github/workflows/win-os-test.yml" push: + branches: + - master paths-ignore: - 'tests/**' - 'tests-ui/**' From 41dd04359bc4efbf7e47b8f5defcc3257f17666e Mon Sep 17 00:00:00 2001 From: Yoland Y <4950057+yoland68@users.noreply.github.com> Date: Tue, 2 Apr 2024 18:36:09 -0700 Subject: [PATCH 4/6] Add debugging --- .github/workflows/win-os-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/win-os-test.yml b/.github/workflows/win-os-test.yml index 65ccbd937..e3a178bd6 100644 --- a/.github/workflows/win-os-test.yml +++ b/.github/workflows/win-os-test.yml @@ -29,6 +29,6 @@ jobs: os: windows cuda_version: 12.1 torch_ver: 'stable' - models-json: '{"v1-5-pruned-emaonly.ckpt": {"url": "https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.ckpt", "directory": "checkpoints"}}' + models-json: '{"v1-5-pruned-emaonly.ckpt": {"url": "https://huggingface.co/runwayml/stable-diffusion-v1-5/resolve/main/v1-5-pruned-emaonly.safetensors?download=true", "directory": "checkpoints"}}' workflow_json_path: '.github/workflows/json_examples/workflow_api.json' timeout: 50 From de200da6dbf1e8af58d6c2ebc27173d403092082 Mon Sep 17 00:00:00 2001 From: Yoland Y <4950057+yoland68@users.noreply.github.com> Date: Tue, 2 Apr 2024 19:52:12 -0700 Subject: [PATCH 5/6] Minor change --- .github/workflows/win-os-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/win-os-test.yml b/.github/workflows/win-os-test.yml index e3a178bd6..775069b86 100644 --- a/.github/workflows/win-os-test.yml +++ b/.github/workflows/win-os-test.yml @@ -1,4 +1,4 @@ -name: Test ComfyUI Windows with Default Workflow +name: Test ComfyUI Windows with Default Workflow 2 on: pull_request: branches: From 0e175f675fbf188af3ade5357251b2dba8115d98 Mon Sep 17 00:00:00 2001 From: Yoland Y <4950057+yoland68@users.noreply.github.com> Date: Tue, 2 Apr 2024 21:41:17 -0700 Subject: [PATCH 6/6] Use master comfy action --- .github/workflows/win-os-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/win-os-test.yml b/.github/workflows/win-os-test.yml index b2c612d49..ef877b99e 100644 --- a/.github/workflows/win-os-test.yml +++ b/.github/workflows/win-os-test.yml @@ -24,7 +24,7 @@ jobs: runs-on: Windows steps: - name: Use ComfyUI GitHub Action - uses: drip-art/comfy-action@yo-win-action + uses: drip-art/comfy-action with: os: windows cuda_version: 12.1