From 108e453eae0e0b50bc15160674b868952d49328b Mon Sep 17 00:00:00 2001 From: fithwum Date: Sun, 20 Jul 2025 12:25:46 -0700 Subject: [PATCH] test --- .gitea/workflows/pipeline.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml index e402d98..0fb6764 100644 --- a/.gitea/workflows/pipeline.yml +++ b/.gitea/workflows/pipeline.yml @@ -75,9 +75,13 @@ jobs: done if [ "$changes" = true ]; then + # Stash local changes before rebasing + git stash push -m "temp-stash-before-rebase" git fetch origin main git rebase origin/main + git stash pop || true + # Now re-check and commit the changes git add .cache/*-base.digest git commit -m "Update base image digests ($(date -u +'%Y-%m-%dT%H:%M:%SZ'))" git push origin HEAD:main