- Remove error handling wrapper - Direct git pull command - Let CI fail naturally on conflicts
This commit is contained in:
parent
83d318de4d
commit
ed0cb3bce6
1 changed files with 1 additions and 5 deletions
|
|
@ -17,11 +17,7 @@ steps:
|
||||||
- name: Setup
|
- name: Setup
|
||||||
run: |
|
run: |
|
||||||
cd /opt/gbo/work/generalbots
|
cd /opt/gbo/work/generalbots
|
||||||
if ! git pull; then
|
git pull
|
||||||
echo "::error::Git pull failed. Please resolve conflicts manually."
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
git log --oneline -1
|
|
||||||
|
|
||||||
- name: Build BotServer and BotUI
|
- name: Build BotServer and BotUI
|
||||||
run: |
|
run: |
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue