[checkupdates] cleanup old rebase before trying a new one

This commit is contained in:
Jochen Sprickerhof 2021-09-02 22:06:39 +02:00
parent 9ae36c97eb
commit 300369d03c

View file

@ -166,6 +166,8 @@ checkupdates_runner:
- echo "${CHECKUPDATES_SSH_DEPLOY_KEY}" | tr -d '\r' | ssh-add -
- url_host=$(echo "${CI_REPOSITORY_URL}" | sed -e 's|https\?://gitlab-ci-token:.*@|ssh://git@|g')
- git remote set-url --push origin "${url_host}"
- git rebase --abort
- rm -fr ".git/rebase-apply"
script:
- fdroid checkupdates --allow-dirty --auto --commit ${CHECKUPDATES_APPIDS} 2>&1 | tee /tmp/out || true
- git pull --rebase origin master