From 05733bc4c823c553b703879951bdd466de489dad Mon Sep 17 00:00:00 2001 From: Kyle Harding Date: Thu, 23 Jan 2025 09:24:09 -0500 Subject: [PATCH] Restore docker build+test conditions Prior to the last change, we only ran docker build+test jobs if there were images to publish, or compose files to test. Restore that behaviour to avoid running docker bake for repos only meant to publish to balena. Change-type: patch Signed-off-by: Kyle Harding --- .github/workflows/flowzone.yml | 9 +-------- flowzone.yml | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml index 73a33b7b6..acfa1b007 100644 --- a/.github/workflows/flowzone.yml +++ b/.github/workflows/flowzone.yml @@ -1315,15 +1315,8 @@ jobs: if: | ( inputs.docker_images || - contains(needs.file_list.outputs.workdir, 'docker-compose.yml') || - contains(needs.file_list.outputs.workdir, 'docker-compose.yaml') || - contains(needs.file_list.outputs.workdir, 'docker-bake.json') || - contains(needs.file_list.outputs.workdir, 'docker-bake.hcl') || contains(needs.file_list.outputs.workdir, 'docker-compose.test.yaml') || - contains(needs.file_list.outputs.workdir, 'docker-compose.test.yml') || - contains(needs.file_list.outputs.workdir, 'docker-bake.override.json') || - contains(needs.file_list.outputs.workdir, 'docker-bake.override.hcl') || - contains(needs.file_list.outputs.workdir, 'Dockerfile') + contains(needs.file_list.outputs.workdir, 'docker-compose.test.yml') ) && ( github.event.action != 'closed' || github.event.pull_request.merged == true diff --git a/flowzone.yml b/flowzone.yml index 673f46f8a..e86f6387f 100644 --- a/flowzone.yml +++ b/flowzone.yml @@ -2080,15 +2080,8 @@ jobs: if: | ( inputs.docker_images || - contains(needs.file_list.outputs.workdir, 'docker-compose.yml') || - contains(needs.file_list.outputs.workdir, 'docker-compose.yaml') || - contains(needs.file_list.outputs.workdir, 'docker-bake.json') || - contains(needs.file_list.outputs.workdir, 'docker-bake.hcl') || contains(needs.file_list.outputs.workdir, 'docker-compose.test.yaml') || - contains(needs.file_list.outputs.workdir, 'docker-compose.test.yml') || - contains(needs.file_list.outputs.workdir, 'docker-bake.override.json') || - contains(needs.file_list.outputs.workdir, 'docker-bake.override.hcl') || - contains(needs.file_list.outputs.workdir, 'Dockerfile') + contains(needs.file_list.outputs.workdir, 'docker-compose.test.yml') ) && ( github.event.action != 'closed' || github.event.pull_request.merged == true