diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml index 79af94d..0e6180d 100644 --- a/.gitea/workflows/pipeline.yml +++ b/.gitea/workflows/pipeline.yml @@ -71,9 +71,12 @@ jobs: done if [ "$changes" = true ]; then + git fetch origin main + git rebase origin/main + git add .cache/*-base.digest git commit -m "Update base image digests ($(date -u +'%Y-%m-%dT%H:%M:%SZ'))" - git push + git push origin HEAD:main else echo "[INFO] No base digest changes to commit." fi @@ -118,7 +121,6 @@ jobs: check_variant "debian" "${{ steps.get_digest.outputs.debian_digest }}" check_variant "basic" "${{ steps.get_digest.outputs.basic_digest }}" - build-alpine: needs: check-for-changes if: needs.check-for-changes.outputs.should_build_alpine == 'true'