Skip to content

Commit f5d52de

Browse files
AnHeuermannclaude
andcommitted
Fix OMSimulator submodule update when directory layout changes
Clean the working tree (including nested git repos) before running submodule update, so that directories that were replaced by submodules (or vice versa) don't block initialization. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 12a0178 commit f5d52de

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

.CI/Jenkinsfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -715,8 +715,9 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
715715
716716
if ! (cmp ~/saved_omc/OMSimulator/.githash .newhash); then
717717
718-
git submodule update || exit 1
719-
git clean -fdx || exit 1
718+
git submodule sync --recursive || exit 1
719+
git clean -ffdx || exit 1
720+
git submodule update --init --recursive --force || exit 1
720721
git submodule foreach --recursive "git fetch --tags --force && git reset --hard && git clean -fdxq -e /git -e /svn" || exit 1
721722
cmake -S . -B build/ -DCMAKE_INSTALL_PREFIX=install/
722723
cmake --build build/ --target install || exit 1

0 commit comments

Comments
 (0)