smallsolar/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gitlab-ci: Fix GitHub push ref conflict in trigger_snap_builds

Browse Source 
At present GitLab CI fails in the trigger_snap_builds stage with
ref-locking errors like:

  "cannot lock ref 'refs/remotes/origin/ci/cherry-3bfd12008be':
   'refs/remotes/origin/ci' exists"

This occurs because git fetch commands download all remote branches,
including conflicting refs where both 'ci' and 'ci/cherry-*' branches
exist, creating filesystem conflicts.

Remove the unnecessary git fetch commands and only push only the master
branch directly to GitHub, avoiding the ref conflict entirely.

Signed-off-by: Simon Glass <simon.glass@canonical.com>
This commit is contained in:
Simon Glass
2025-12-23 13:02:50 -07:00
parent ae624cca60
commit 90e3beffb7
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -970,7 +970,5 @@ trigger_snap_builds:
git config --global --add safe.directory $CI_PROJECT_DIR
cd $CI_PROJECT_DIR
git remote add github git@github.com:sjg20/u-boot-concept.git || true
git fetch github master --depth=1
git fetch origin "--shallow-since=$(git log -1 --format=%ci github/master)"
git push github HEAD:master --force
echo "GitHub push completed"