From 8b724141cdb81ecbe83fb5030c1c1238ba60f498 Mon Sep 17 00:00:00 2001 From: Weston Clark Date: Thu, 1 Oct 2026 17:31:14 -0400 Subject: [PATCH] fix: make merges actually deploy, and stop the flaky API test from blocking them deploy needs test-api and test-web, but both skipped on the merge ("closed") event, so GitHub skipped deploy too. No merge has deployed since the pipeline was added. They now also run when a PR is merged, so the deploy still waits on passing tests. Also points cloud-services at fix/broadcast-cancellation, which fixes the test_hub_ws failure that hit about half of the test-api runs. Co-Authored-By: Claude Opus 5.5 --- .github/workflows/ci.yml | 7 ++++--- cloud-services | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d05e3ed..dee77cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,15 +6,16 @@ on: types: [opened, synchronize, reopened, closed] jobs: - # Run tests on PRs (not on merge) + # Run tests on PRs. test-api and test-web also run on merge: deploy needs them, + # and a skipped job makes everything that needs it skip too. test-api: - if: github.event.action != 'closed' + if: github.event.action != 'closed' || github.event.pull_request.merged == true uses: ./.github/workflows/test-cloud-services.yml with: python_version: '3.11' test-web: - if: github.event.action != 'closed' + if: github.event.action != 'closed' || github.event.pull_request.merged == true uses: ./.github/workflows/test-web-client.yml with: node_version: '20' diff --git a/cloud-services b/cloud-services index b20da25..46e47f2 160000 --- a/cloud-services +++ b/cloud-services @@ -1 +1 @@ -Subproject commit b20da250d92d120f17e3cd27a110db97d41caece +Subproject commit 46e47f2b9fc7f7179bef359bf4480d8914a84823