diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2bab01cd00..d4f4a51f3b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -141,7 +141,7 @@ checkupdates_runner: - url_host=$(echo "${CI_REPOSITORY_URL}" | sed -e 's|https\?://gitlab-ci-token:.*@|ssh://git@|g') - git remote set-url --push origin "${url_host}" script: - - fdroid checkupdates --allow-dirty --auto --commit ${CHECKUPDATES_APPIDS} + - fdroid checkupdates --allow-dirty --auto --commit ${CHECKUPDATES_APPIDS} || true - git pull --rebase origin master # when two jobs try to push at the same time they occasionally fail, so try one more time if it fails - git push origin HEAD:master || (git pull --rebase origin master && git push origin HEAD:master)