sudoxreboot/fdroiddata
1
0
Fork 0
mirror of https://github.com/sudoxnym/fdroiddata.git synced 2026-05-17 19:29:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[checkupdates] reset repo state

Browse source
This commit is contained in:
Jochen Sprickerhof 2021-09-03 11:31:25 +02:00
parent cf9885dfa1
commit b3e17309fa
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -166,9 +166,11 @@ 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}"
# somehow there is an old rebase in the image
# reset repo to origin state before adding new commits
- git rebase --abort || true
- rm -fr ".git/rebase-apply"
- git checkout master || true
- git reset --hard origin/master || true
script:
- fdroid checkupdates --allow-dirty --auto --commit ${CHECKUPDATES_APPIDS} 2>&1 | tee /tmp/out || true
- git pull --rebase origin master