diff options
| author | penguin <penguin@epenguin.net> | 2025-12-06 14:13:19 -0600 |
|---|---|---|
| committer | John Turner <jturner.usa@gmail.com> | 2025-12-06 20:56:58 +0000 |
| commit | 26f5776db9184b543f2096a333fdcf1b06be98fb (patch) | |
| tree | 47a037ce7957eed51b9038915559b575dbd85702 | |
| parent | 892146f59a3d5d848def06d661550ec63e007950 (diff) | |
| download | gentoo-utils-26f5776db9184b543f2096a333fdcf1b06be98fb.tar.gz | |
infra: docker: fix workflow to always run on master
| -rw-r--r-- | .gitea/workflows/gentoo-utils.yml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/.gitea/workflows/gentoo-utils.yml b/.gitea/workflows/gentoo-utils.yml index c6e78f0..f00142f 100644 --- a/.gitea/workflows/gentoo-utils.yml +++ b/.gitea/workflows/gentoo-utils.yml @@ -20,19 +20,21 @@ jobs: - name: Check for changes before building id: image-changes run: | - if git diff --name-only ${{ gitea.event.before }} ${{ gitea.sha }} | grep -q '^\.docker/'; then - echo "changes_detected=true" >> $GITEA_OUTPUT + if [[ ${{ gitea.ref_name }} == ${{ gitea.event.repository.default_branch }} ]]; then + echo changes_detected=true >> $GITEA_OUTPUT + elif git diff ${{ gitea.event.before }} ${{ gitea.sha }} --no-patch --exit-code .docker; then + echo changes_detected=true >> $GITEA_OUTPUT else - echo "changes_detected=false" >> $GITEA_OUTPUT - fi + echo changes_detected=false >> $GITEA_OUTPUT + fi - name: Set up Docker buildx - if: steps.docker-changes.outputs.changes_detected == 'true' + if: steps.image-changes.outputs.changes_detected == 'true' uses: docker/setup-buildx-action@v3 - name: Log in to Github Container Registry - if: steps.docker-changes.outputs.changes_detected == 'true' + if: steps.image-changes.outputs.changes_detected == 'true' uses: docker/login-action@v3 with: registry: git.epenguin.net @@ -41,7 +43,7 @@ jobs: - name: Build and push - if: steps.docker-changes.outputs.changes_detected == 'true' + if: steps.image-changes.outputs.changes_detected == 'true' uses: docker/build-push-action@v6 with: push: true |