From bf44840484ceb08faa55f8d403537ffc5e1dea56 Mon Sep 17 00:00:00 2001
From: fithwum <fithwum@hotmail.com>
Date: Sun, 11 Jan 2026 06:52:38 -0800
Subject: [PATCH] test

---
 .cache/alpine-base.digest     |  1 -
 .cache/basic-base.digest      |  1 -
 .cache/debian-base.digest     |  1 -
 .gitea/workflows/pipeline.yml | 15 +++++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)
 delete mode 100644 .cache/alpine-base.digest
 delete mode 100644 .cache/basic-base.digest
 delete mode 100644 .cache/debian-base.digest

diff --git a/.cache/alpine-base.digest b/.cache/alpine-base.digest
deleted file mode 100644
index ba65e34..0000000
--- a/.cache/alpine-base.digest
+++ /dev/null
@@ -1 +0,0 @@
-alpine@sha256:865b95f46d98cf867a156fe4a135ad3fe50d2056aa3f25ed31662dff6da4eb62
diff --git a/.cache/basic-base.digest b/.cache/basic-base.digest
deleted file mode 100644
index 5412bfb..0000000
--- a/.cache/basic-base.digest
+++ /dev/null
@@ -1 +0,0 @@
-gitea.fithwum.tech/fithwum/debian-base@sha256:3b785538554f75ca53833cf6aa0d61ead2fa8a797e0c33e9b51ef2500f2b0ed6
diff --git a/.cache/debian-base.digest b/.cache/debian-base.digest
deleted file mode 100644
index 5412bfb..0000000
--- a/.cache/debian-base.digest
+++ /dev/null
@@ -1 +0,0 @@
-gitea.fithwum.tech/fithwum/debian-base@sha256:3b785538554f75ca53833cf6aa0d61ead2fa8a797e0c33e9b51ef2500f2b0ed6
diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml
index 4bb9def..114506b 100644
--- a/.gitea/workflows/pipeline.yml
+++ b/.gitea/workflows/pipeline.yml
@@ -326,18 +326,21 @@ jobs:
             git add */build-info.json
             git commit -m "Update build-info on $(date -u +'%Y-%m-%dT%H:%M:%SZ')"
 
-            # Push temporary branch
+            # Push temp branch
             git push origin "$TEMP_BRANCH"
 
-            # Merge temporary branch into main safely
+            # Switch back to main
             git checkout main
             git fetch origin main
-            git merge --no-ff --no-edit "$TEMP_BRANCH"
 
-            # Push main branch
-            git push origin main
+            # Merge temp branch using --allow-unrelated-histories (safe in CI)
+            git merge --no-ff --no-edit "$TEMP_BRANCH" || true
 
-            # Delete temporary branch remotely
+            # Force push main to remote to ensure update
+            git push origin main --force
+
+            # Delete temporary branch locally and remotely
+            git branch -D "$TEMP_BRANCH"
             git push origin --delete "$TEMP_BRANCH" || true
           else
             echo "[INFO] No build-info changes to commit."