Skip to content

Commit 45f03fa

Browse files
committed
Working with test containers
1 parent ff3f24b commit 45f03fa

1 file changed

Lines changed: 55 additions & 47 deletions

File tree

ci/jenkins/Jenkinsfile.groovy

Lines changed: 55 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -541,9 +541,17 @@ pipeline {
541541
checkout scm
542542

543543
bat script: '''
544-
PATH=%PATH%;C:\\Program Files\\CMake\\bin;C:\\src\\vcpkg;C:\\Program Files\\Git\\bin
544+
PATH=C:\\src\\vcpkg;%PATH%;C:\\Program Files\\CMake\\bin;C:\\Program Files\\Git\\bin
545+
git -C C:\src\vcpkg pull --rebase
546+
C:\src\vcpkg\bootstrap-vcpkg.bat -disableMetrics
547+
vcpkg upgrade --no-dry-run
548+
vcpkg remove --outdated
545549
vcpkg integrate install
546-
vcpkg install rapidjson gtest zlib openssl boost --triplet x64-windows
550+
vcpkg install rapidjson gtest zlib openssl ^
551+
boost-program-options boost-filesystem boost-date-time ^
552+
boost-coroutine boost-context boost-chrono ^
553+
boost-asio boost-system ^
554+
boost-log --triplet x64-windows
547555
if %errorlevel% neq 0 exit /b %errorlevel%
548556
rmdir /S /Q build
549557
mkdir build
@@ -572,51 +580,51 @@ pipeline {
572580
}
573581
}
574582

575-
stage('Windows X64 with vcpkg MT CTX') {
576-
577-
agent {label 'windows'}
578-
579-
options {
580-
// vcpkg now installs and compiles pretty much everything that exists on github if you ask it to prepare boost and openssl.
581-
// It's becoming as bad as js and npm.
582-
timeout(time: 60, unit: "MINUTES")
583-
}
584-
585-
steps {
586-
echo "Building on Windows in ${WORKSPACE}"
587-
checkout scm
588-
589-
bat script: '''
590-
PATH=%PATH%;C:\\Program Files\\CMake\\bin;C:\\src\\vcpkg;C:\\Program Files\\Git\\bin
591-
vcpkg integrate install
592-
vcpkg install rapidjson gtest zlib openssl boost --triplet x64-windows
593-
if %errorlevel% neq 0 exit /b %errorlevel%
594-
rmdir /S /Q build
595-
mkdir build
596-
cd build
597-
cmake -DRESTC_CPP_THREADED_CTX=ON -DCMAKE_TOOLCHAIN_FILE=C:/src/vcpkg/scripts/buildsystems/vcpkg.cmake ..
598-
if %errorlevel% neq 0 exit /b %errorlevel%
599-
cmake --build . --config Release
600-
if %errorlevel% neq 0 exit /b %errorlevel%
601-
echo "Build is OK"
602-
'''
603-
604-
echo 'Getting ready to run tests'
605-
script {
606-
try {
607-
bat script: '''
608-
PATH=%PATH%;C:\\src\\vcpkg\\installed\\x64-windows\\bin;C:\\Program Files\\CMake\\bin
609-
cd build
610-
ctest -C Release
611-
if %errorlevel% neq 0 exit /b %errorlevel%
612-
'''
613-
} catch (exc) {
614-
615-
unstable(message: "${STAGE_NAME} - Testing failed")
616-
}
617-
}
618-
}
619-
}
583+
// stage('Windows X64 with vcpkg MT CTX') {
584+
585+
// agent {label 'windows'}
586+
587+
// options {
588+
// // vcpkg now installs and compiles pretty much everything that exists on github if you ask it to prepare boost and openssl.
589+
// // It's becoming as bad as js and npm.
590+
// timeout(time: 60, unit: "MINUTES")
591+
// }
592+
593+
// steps {
594+
// echo "Building on Windows in ${WORKSPACE}"
595+
// checkout scm
596+
597+
// bat script: '''
598+
// PATH=%PATH%;C:\\Program Files\\CMake\\bin;C:\\src\\vcpkg;C:\\Program Files\\Git\\bin
599+
// vcpkg integrate install
600+
// vcpkg install rapidjson gtest zlib openssl boost --triplet x64-windows
601+
// if %errorlevel% neq 0 exit /b %errorlevel%
602+
// rmdir /S /Q build
603+
// mkdir build
604+
// cd build
605+
// cmake -DRESTC_CPP_THREADED_CTX=ON -DCMAKE_TOOLCHAIN_FILE=C:/src/vcpkg/scripts/buildsystems/vcpkg.cmake ..
606+
// if %errorlevel% neq 0 exit /b %errorlevel%
607+
// cmake --build . --config Release
608+
// if %errorlevel% neq 0 exit /b %errorlevel%
609+
// echo "Build is OK"
610+
// '''
611+
612+
// echo 'Getting ready to run tests'
613+
// script {
614+
// try {
615+
// bat script: '''
616+
// PATH=%PATH%;C:\\src\\vcpkg\\installed\\x64-windows\\bin;C:\\Program Files\\CMake\\bin
617+
// cd build
618+
// ctest -C Release
619+
// if %errorlevel% neq 0 exit /b %errorlevel%
620+
// '''
621+
// } catch (exc) {
622+
623+
// unstable(message: "${STAGE_NAME} - Testing failed")
624+
// }
625+
// }
626+
// }
627+
// }
620628

621629
} // parallel
622630

0 commit comments

Comments
 (0)