Skip to content

Commit c3b1fb1

Browse files
committed
Fix git push to data branch: fetch remote first, use force-with-lease
- Fetch remote data branch before checkout to handle existing commits - Use --force-with-lease instead of regular push for safer force push
1 parent 4f4953b commit c3b1fb1

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

.github/workflows/data-update-rpi-imager-json.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
run: |
4848
4949
cd armbian.github.io
50+
git fetch origin data:remotes/origin/data || true
5051
git checkout data || git checkout -b data
5152
mkdir -p data/
5253
@@ -56,4 +57,4 @@ jobs:
5657
git config user.email "github-actions[bot]@users.noreply.github.com"
5758
git add data/.
5859
git diff --cached --quiet || git commit -m "Update WEB index files"
59-
git push
60+
git push origin data --force-with-lease

0 commit comments

Comments
 (0)