Skip to content

Commit 9ca8f76

Browse files
committed
force fetch of tags to handle the floating tag 'nightly'
1 parent e83c3f4 commit 9ca8f76

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

.CI/Jenkinsfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -717,7 +717,7 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
717717
718718
git submodule update || exit 1
719719
git clean -fdx || exit 1
720-
git submodule foreach --recursive "git fetch --tags && git reset --hard && git clean -fdxq -e /git -e /svn" || exit 1
720+
git submodule foreach --recursive "git fetch --tags --force && git reset --hard && git clean -fdxq -e /git -e /svn" || exit 1
721721
cmake -S . -B build/ -DCMAKE_INSTALL_PREFIX=install/
722722
cmake --build build/ --target install || exit 1
723723
./install/bin/OMSimulator --version || exit 1
@@ -779,9 +779,9 @@ def runRegressiontest(branch, name, extraFlags, omsHash, dbPrefix, sshConfig, om
779779
cd ${OMCPATH}
780780
781781
if ! test -f ~/saved_omc/${name}/.nogit; then
782-
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
782+
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
783783
git submodule update --init --recursive --force || (rm -rf * && git reset --hard && git submodule update --init --recursive --force) || exit 1
784-
git submodule foreach --recursive "git fetch --tags && git reset --hard && git clean -fdxq -e /git -e /svn" || exit 1
784+
git submodule foreach --recursive "git fetch --tags --force && git reset --hard && git clean -fdxq -e /git -e /svn" || exit 1
785785
git clean -fdxq || exit 1
786786
git submodule status --recursive
787787
fi

0 commit comments

Comments
 (0)