Skip to content

Commit fb3dfb2

Browse files
authored
get more info on cmake and env vars (#13109)
1 parent 429db6e commit fb3dfb2

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

.CI/common.groovy

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ void buildOMC(CC, CXX, extraFlags, Boolean buildCpp, Boolean clean) {
177177
echo set -ex
178178
echo export OPENMODELICAHOME="\${MSYS_WORKSPACE}/build"
179179
echo export OPENMODELICALIBRARY="\${MSYS_WORKSPACE}/build/lib/omlibrary"
180+
echo set
181+
echo which cmake
180182
echo time make -f Makefile.omdev.mingw \${MAKETHREADS} omc testsuite-depends
181183
echo cd \${MSYS_WORKSPACE}
182184
echo make -f Makefile.omdev.mingw \${MAKETHREADS} BUILDTYPE=Release all-runtimes
@@ -318,6 +320,7 @@ void buildOMC_CMake(cmake_args, cmake_exe='cmake') {
318320
echo export MSYS_WORKSPACE="`cygpath '${WORKSPACE}'`"
319321
echo echo MSYS_WORKSPACE: \${MSYS_WORKSPACE}
320322
echo cd \${MSYS_WORKSPACE}
323+
echo which cmake
321324
echo set -ex
322325
echo mkdir build_cmake
323326
echo ${cmake_exe} --version
@@ -360,6 +363,8 @@ void buildGUI(stash, qtVersion) {
360363
echo set -e
361364
echo export OPENMODELICAHOME="\${MSYS_WORKSPACE}/build"
362365
echo export OPENMODELICALIBRARY="\${MSYS_WORKSPACE}/build/lib/omlibrary"
366+
echo set
367+
echo which cmake
363368
echo time make -f Makefile.omdev.mingw \${MAKETHREADS} qtclients ${getQtMajorVersion(qtVersion)}
364369
echo echo Check that at least OMEdit can be started
365370
echo ./build/bin/OMEdit --help
@@ -467,6 +472,7 @@ if not exist "%OMDEV%" (
467472
call SETUP_OMDEV.bat
468473
) else (
469474
cd %OMDEV%
475+
git fetch origin
470476
git reset --hard origin/master
471477
git pull
472478
call SETUP_OMDEV.bat

0 commit comments

Comments
 (0)