From 48bae6dcf4d7cfda9b048d826b9b210d255293d9 Mon Sep 17 00:00:00 2001 From: John Ajera Date: Tue, 18 Aug 2026 13:51:19 +1200 Subject: [PATCH 1/2] ci: run lab before merge and before image publish Keep Integration as a pull-request check. On main, Build and Release reuses that workflow and publishes only after prove.sh passes. --- .github/workflows/build-and-release.yml | 4 ++++ .github/workflows/integration.yml | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 35753bc..3a008f6 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -9,7 +9,11 @@ on: workflow_dispatch: jobs: + lab: + uses: ./.github/workflows/integration.yml + build: + needs: lab permissions: contents: write packages: write diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 0b89dc8..4ec3441 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -4,10 +4,8 @@ on: pull_request: branches: - main - push: - branches: - - main workflow_dispatch: + workflow_call: jobs: lab: From 0bd1773d864e15f1be82d26ddbe806167d18add4 Mon Sep 17 00:00:00 2001 From: John Ajera Date: Tue, 18 Aug 2026 13:56:39 +1200 Subject: [PATCH 2/2] ci: rename the integration job from lab to test Keep lab/ as the compose fixture. In CI, test is the check that must pass before merge and before image publish. --- .github/workflows/build-and-release.yml | 4 ++-- .github/workflows/integration.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 3a008f6..09cd335 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -9,11 +9,11 @@ on: workflow_dispatch: jobs: - lab: + test: uses: ./.github/workflows/integration.yml build: - needs: lab + needs: test permissions: contents: write packages: write diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index 4ec3441..bd6e30c 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -8,7 +8,7 @@ on: workflow_call: jobs: - lab: + test: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4