Skip to content

Commit 5eb1a60

Browse files
authored
fix(ci): stash changes before rebase in manifest workflow (#218)
1 parent a2c5818 commit 5eb1a60

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

.github/workflows/generate-manifests-from-r2.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,11 @@ jobs:
119119
run: |
120120
git config user.name "github-actions[bot]"
121121
git config user.email "github-actions[bot]@users.noreply.github.com"
122+
git stash --include-untracked
123+
git pull --rebase origin main
124+
git stash pop
122125
git add src/internal/manifest/data/
123126
git commit -m "chore(manifest): regenerate manifests from R2"
124-
git pull --rebase origin main
125127
git push
126128
127129
- name: Generate summary

0 commit comments

Comments
 (0)