Skip to content

Commit

Permalink
Restore docker build+test conditions
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
klutchell committed Jan 23, 2025
1 parent 04c1dfe commit 05733bc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/flowzone.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 1 addition & 8 deletions flowzone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 05733bc

Please sign in to comment.