From 9ca8f76e9a8902eecdef315d6776167d934d8252 Mon Sep 17 00:00:00 2001 From: Adrian Pop Date: Sun, 19 Apr 2026 13:33:35 +0200 Subject: [PATCH] force fetch of tags to handle the floating tag 'nightly' --- .CI/Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.CI/Jenkinsfile b/.CI/Jenkinsfile index 2214bdb..a32bd6a 100644 --- a/.CI/Jenkinsfile +++ b/.CI/Jenkinsfile @@ -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 @@ -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