maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix in CreateWorkspace

Browse Source 
Previously, the script attempted to directly merge ${merge}, which could f
ail if the branch was not already available locally. This update explicitly
fetches the branch from origin and then merges FETCH_HEAD with --ff, ensuring
the merge works even when the branch is missing locally.
This commit is contained in:
Jaroslava Fiedlerova
2025-10-01 13:36:53 +02:00
parent 6193d7c7f4
commit 7935c19d21
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ci-scripts/scripts/create_workspace.sh
+1 -1
View File
@@ -22,5 +22,5 @@ git config user.name "OAI Jenkins"
git config advice.detachedHead false git config advice.detachedHead false
mkdir -p cmake_targets/log mkdir -p cmake_targets/log
git checkout -f ${ref} git checkout -f ${ref}
[ -n "${merge}" ] && git merge --ff ${merge} -m "Temporary merge for CI" [ -n "${merge}" ] && git fetch origin ${merge} && git merge --ff FETCH_HEAD -m "Temporary merge for CI"
exit 0 exit 0