From 7935c19d21f9ef848256204b81a78360b02a1da3 Mon Sep 17 00:00:00 2001 From: Jaroslava Fiedlerova Date: Mon, 28 Jul 2025 22:31:11 +0200 Subject: [PATCH] Fix in CreateWorkspace 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. --- ci-scripts/scripts/create_workspace.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-scripts/scripts/create_workspace.sh b/ci-scripts/scripts/create_workspace.sh index c8410802db..a8359a9ae4 100755 --- a/ci-scripts/scripts/create_workspace.sh +++ b/ci-scripts/scripts/create_workspace.sh @@ -22,5 +22,5 @@ git config user.name "OAI Jenkins" git config advice.detachedHead false mkdir -p cmake_targets/log 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