From 2109ca83a73f79134f5079ffea5c6b084e0eef5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A1lm=C3=A1n=20=E2=80=9EKAMI=E2=80=9D=20Szalai?= Date: Tue, 18 Aug 2026 12:54:15 +0200 Subject: [PATCH] Retry push in weekly trend workflow to handle concurrent commits --- .github/workflows/weekly_trend.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/weekly_trend.yml b/.github/workflows/weekly_trend.yml index d8c7847..46e4a9f 100644 --- a/.github/workflows/weekly_trend.yml +++ b/.github/workflows/weekly_trend.yml @@ -82,5 +82,11 @@ jobs: git config user.name "PlaylistBot" git config user.email "playlistbot@users.noreply.github.com" git add .github/checker-history/failed.txt - git diff --staged --quiet || git commit -m "Weekly checker snapshot ($(date -u +%Y-%m-%d))" - git diff --quiet HEAD @{u} 2>/dev/null || git push + git diff --staged --quiet && exit 0 + git commit -m "Weekly checker snapshot ($(date -u +%Y-%m-%d))" + for i in 1 2 3 4 5; do + git fetch origin master + git rebase origin/master && git push && break + echo "Push attempt $i failed, retrying..." + sleep 5 + done