Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .CI/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -717,7 +717,7 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om

git submodule update || exit 1
git clean -fdx || exit 1
git submodule foreach --recursive "git fetch --tags && git reset --hard && git clean -fdxq -e /git -e /svn" || exit 1
git submodule foreach --recursive "git fetch --tags --force && git reset --hard && git clean -fdxq -e /git -e /svn" || exit 1
cmake -S . -B build/ -DCMAKE_INSTALL_PREFIX=install/
cmake --build build/ --target install || exit 1
./install/bin/OMSimulator --version || exit 1
Expand Down Expand Up @@ -779,9 +779,9 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
cd ${OMCPATH}

if ! test -f ~/saved_omc/${name}/.nogit; then
git reset --hard && git checkout -f "${branch}" && (git rev-parse --verify "tags/${branch}" || (git reset --hard "origin/${branch}" && git pull)) && git fetch --tags || exit 1
git reset --hard && git checkout -f "${branch}" && (git rev-parse --verify "tags/${branch}" || (git reset --hard "origin/${branch}" && git pull)) && git fetch --tags --force || exit 1
git submodule update --init --recursive --force || (rm -rf * && git reset --hard && git submodule update --init --recursive --force) || exit 1
git submodule foreach --recursive "git fetch --tags && git reset --hard && git clean -fdxq -e /git -e /svn" || exit 1
git submodule foreach --recursive "git fetch --tags --force && git reset --hard && git clean -fdxq -e /git -e /svn" || exit 1
git clean -fdxq || exit 1
git submodule status --recursive
fi
Expand Down
Loading