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

checkupdates: drop updates to files that where changed in the repo

Browse source 
This allows the fdroiddata maintainers to commit changes and
checkupdates will drop changes to the affected files and only push the
remaining commits.
This commit is contained in:
Jochen Sprickerhof 2024-08-01 08:47:00 +02:00
parent 0a2e9a2fd8
commit fa289579cb
No known key found for this signature in database
GPG key ID: 5BFFDCC258E69433
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitlab-ci.yml
View file

@ -337,9 +337,8 @@ checkupdates_runner:
- echo "${#CHECKUPDATES_APPIDS[@]}"
- fdroid checkupdates --allow-dirty --auto --commit "${CHECKUPDATES_APPIDS[@]}" 2>&1 | tee /tmp/out || true
- git pull --rebase origin master
# when two jobs try to push at the same time they occasionally fail, so try it again
- while ! git push origin HEAD:master; do git pull --rebase origin master; done
- while ! git push origin HEAD:master; do git pull --rebase --strategy-option=ours origin master; done
- echo "============== Summary ====================="
- 'grep -v "INFO: Processing" /tmp/out || true'