From ec66aa4004d613e43c0662c28a6e41c3b341995f Mon Sep 17 00:00:00 2001 From: "Calvin A. Allen" Date: Mon, 26 Jan 2026 11:03:51 -0500 Subject: [PATCH] fix(ci): stash changes before rebase in manifest workflow --- .github/workflows/generate-manifests-from-r2.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/generate-manifests-from-r2.yml b/.github/workflows/generate-manifests-from-r2.yml index 78847c3..cae937d 100644 --- a/.github/workflows/generate-manifests-from-r2.yml +++ b/.github/workflows/generate-manifests-from-r2.yml @@ -119,9 +119,11 @@ jobs: run: | git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" + git stash --include-untracked + git pull --rebase origin main + git stash pop git add src/internal/manifest/data/ git commit -m "chore(manifest): regenerate manifests from R2" - git pull --rebase origin main git push - name: Generate summary