1 Commits

Author SHA1 Message Date
c3bf7ff49f infra: actions: fix docker changes detector so it doesnt always build on force pushes
Some checks failed
Gentoo Utils / build-oci-image (push) Failing after 5s
Gentoo Utils / build (push) Has been skipped
Gentoo Utils / test (push) Has been skipped
Gentoo Utils / check-format (push) Has been skipped
Gentoo Utils / docs (push) Has been skipped
2025-12-12 18:04:44 -06:00

View File

@@ -28,7 +28,7 @@ jobs:
image_tag="$(echo "$image_tag" | sed -E 's/[^a-zA-Z0-9]/-/g')"
# rebase breaks gitea.event.before, so check to make sure the hash provided exists
if ! git merge-base --is-ancestor $comparison_hash $branch_name; then
if ! git merge-base --is-ancestor $comparison_hash origin/$branch_name >/dev/null 2>&1; then
comparison_hash=$(git merge-base ${{ gitea.event.repository.default_branch }} $branch_name)
fi