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
Some checks failed
BlockStorage/repertory_linux_builds/pipeline/head There was a failure building this commit
This commit is contained in:
commit
b4403ff959
@ -6,7 +6,7 @@ pipeline {
|
||||
environment {
|
||||
BUILD_ARGS = '--build . -j 8'
|
||||
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"
|
||||
}
|
||||
|
||||
@ -68,6 +68,10 @@ pipeline {
|
||||
agent {
|
||||
dockerfile {
|
||||
filename 'mingw64'
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
additionalBuildArgs '--build-arg NUM_JOBS=8'
|
||||
>>>>>>> 6ecad9af72106de84ac2984785f3838d7391ffca
|
||||
dir 'docker/64_bit'
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user