From df73f9a18fc927fd850fea589a9c6a04af80ea6f Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Mon, 29 Jan 2024 09:48:02 -0600 Subject: [PATCH 1/2] fix --- .jenkins_linux_builds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jenkins_linux_builds b/.jenkins_linux_builds index 8561ea99..4d257950 100644 --- a/.jenkins_linux_builds +++ b/.jenkins_linux_builds @@ -68,7 +68,7 @@ pipeline { agent { dockerfile { filename 'mingw64' - args '--build-arg NUM_JOBS=8' + additionalBuildArgs '--build-arg NUM_JOBS=8' dir 'docker/64_bit' } } From 6ecad9af72106de84ac2984785f3838d7391ffca Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Mon, 29 Jan 2024 10:54:57 -0600 Subject: [PATCH 2/2] fix windows build --- .jenkins_linux_builds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.jenkins_linux_builds b/.jenkins_linux_builds index 4d257950..0d7abc97 100644 --- a/.jenkins_linux_builds +++ b/.jenkins_linux_builds @@ -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" }