fix(ci): git stash before pull to avoid unstaged changes error
All checks were successful
BotServer CI / build (push) Successful in 1m29s
All checks were successful
BotServer CI / build (push) Successful in 1m29s
This commit is contained in:
parent
0e260c9927
commit
4e19d786ac
1 changed files with 1 additions and 0 deletions
|
|
@ -21,6 +21,7 @@ jobs:
|
||||||
- name: Setup
|
- name: Setup
|
||||||
run: |
|
run: |
|
||||||
cd /opt/gbo/work/generalbots
|
cd /opt/gbo/work/generalbots
|
||||||
|
git stash 2>/dev/null || true
|
||||||
OLD_REV=$(git rev-parse HEAD)
|
OLD_REV=$(git rev-parse HEAD)
|
||||||
git pull --rebase || { git rebase --abort; git reset --hard origin/main; }
|
git pull --rebase || { git rebase --abort; git reset --hard origin/main; }
|
||||||
NEW_REV=$(git rev-parse HEAD)
|
NEW_REV=$(git rev-parse HEAD)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue