Merge branch 'development' of ssh://git.fifthgrid.com:3022/blockstorage/repertory into development
Some checks failed
BlockStorage/repertory_linux_builds/pipeline/head There was a failure building this commit

This commit is contained in:
Scott E. Graves 2024-01-29 11:20:47 -06:00
commit b4403ff959

View File

@ -6,7 +6,7 @@ pipeline {
environment { environment {
BUILD_ARGS = '--build . -j 8' BUILD_ARGS = '--build . -j 8'
CONFIGURE_ARGS = '../.. -DCMAKE_BUILD_TYPE=Release -DREPERTORY_ENABLE_S3=ON' CONFIGURE_ARGS = '../.. -DCMAKE_BUILD_TYPE=Release -DREPERTORY_ENABLE_S3=ON'
CONFIGURE_MINGW64_ARGS = '../.. -DCMAKE_BUILD_TYPE=Release -DREPERTORY_ENABLE_S3=ON -DCMAKE_TOOLCHAIN_FILE=${WORKSPACE}/cmake/mingw-w64-x86_64.cmake' CONFIGURE_MINGW64_ARGS = '../.. -DCMAKE_BUILD_TYPE=Release -DREPERTORY_ENABLE_S3=ON -DCMAKE_TOOLCHAIN_FILE=/cmake_toolchain.cmake'
REPERTORY_TEST_DIR = "${HOME}/.ci/cfg" REPERTORY_TEST_DIR = "${HOME}/.ci/cfg"
} }
@ -68,6 +68,10 @@ pipeline {
agent { agent {
dockerfile { dockerfile {
filename 'mingw64' filename 'mingw64'
<<<<<<< HEAD
=======
additionalBuildArgs '--build-arg NUM_JOBS=8'
>>>>>>> 6ecad9af72106de84ac2984785f3838d7391ffca
dir 'docker/64_bit' dir 'docker/64_bit'
} }
} }