Merge pull request 'fix: fix: entrypoint-llama.sh should reset base repo to origin/main on startup (#336)' (#350) from fix/issue-336 into main
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
All checks were successful
ci/woodpecker/push/ci Pipeline was successful
This commit is contained in:
commit
8f58f834d5
1 changed files with 9 additions and 0 deletions
|
|
@ -28,6 +28,15 @@ if [ ! -d "${PROJECT_REPO_ROOT}/.git" ]; then
|
|||
log "Repo cloned"
|
||||
fi
|
||||
|
||||
# Reset base repo to origin/main to avoid divergence warnings
|
||||
su -s /bin/bash agent -c "
|
||||
cd \"${PROJECT_REPO_ROOT}\"
|
||||
git fetch origin main
|
||||
git checkout main 2>/dev/null || true
|
||||
git reset --hard origin/main
|
||||
" || true
|
||||
log "Base repo reset to origin/main"
|
||||
|
||||
log "Entering poll loop (interval: ${POLL_INTERVAL:-300}s)"
|
||||
|
||||
while true; do
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue