Skip to content

Commit f58e1b5

Browse files
committed
fix(ci): robust git sync for manifests and update Cargo.lock
1 parent e8bc25f commit f58e1b5

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ jobs:
161161
cp homebrew/vanity_crypto.rb ../vanity_crypto.rb.tmp
162162
cp scoop/vanity_crypto.json ../vanity_crypto.json.tmp
163163
164-
# 2. Switch explicitly to proper main branch
164+
# 2. Switch explicitly to proper main branch and Sync
165165
git fetch origin main
166-
git checkout main
167-
git pull origin main --rebase
166+
git checkout -f main # Force checkout to discard current dirty state (we have backups)
167+
git pull origin main --rebase # Pull clean
168168
169169
# 3. Restore updates
170170
mv ../vanity_crypto.rb.tmp homebrew/vanity_crypto.rb

Cargo.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)