From e2f14aa42d23b56982329e3261f1b32bb752b60b Mon Sep 17 00:00:00 2001 From: Nicolas Bennett <3158446+nbenn@users.noreply.github.com> Date: Fri, 20 Mar 2026 06:43:58 +0000 Subject: [PATCH 1/2] Fix e2e wrapper: always run and check dependency result When a matrix entry fails, the wrapper job was skipped (due to needs dependency), and skipped satisfies required checks. Add if: always() and explicitly fail when any run job didn't succeed. --- .github/workflows/merge.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 6883c31..b4416bd 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -56,7 +56,12 @@ jobs: docker compose -f "examples/${{ matrix.example }}/docker-compose.yml" down -v --remove-orphans 2>/dev/null || true e2e: + if: always() needs: [run] runs-on: ubuntu-latest steps: + - if: needs.run.result != 'success' + run: | + echo "::error::e2e failed (run result: ${{ needs.run.result }})" + exit 1 - run: echo "All e2e tests passed." From f032f26194efbdd46a37661e51e6e3f3fcd49fad Mon Sep 17 00:00:00 2001 From: Nicolas Bennett <3158446+nbenn@users.noreply.github.com> Date: Fri, 20 Mar 2026 06:57:23 +0000 Subject: [PATCH 2/2] Allow multiple sessions per worker in hello-blockr e2e test Default max_sessions_per_worker=1 spawns a new worker per user. On CI runners with limited resources, the second worker crashes. Allow 10 sessions per worker so user2 reuses user1's worker. --- e2e/hello_blockr_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/hello_blockr_test.go b/e2e/hello_blockr_test.go index 8faf898..2b27f93 100644 --- a/e2e/hello_blockr_test.go +++ b/e2e/hello_blockr_test.go @@ -47,7 +47,7 @@ func TestHelloBlockr(t *testing.T) { client1 = &APIClient{BaseURL: baseURL, Token: token1} appID = client1.CreateApp(t, "hello-blockr") - client1.UpdateApp(t, appID, `{"access_type":"logged_in"}`) + client1.UpdateApp(t, appID, `{"access_type":"logged_in","max_sessions_per_worker":10}`) bundle := makeBundle(t, "../examples/hello-blockr/app") taskID, _ := client1.UploadBundle(t, appID, bundle)