diff --git a/Jenkinsfile b/Jenkinsfile index 76ed7c9c8f4097d3f1f88eecc6cd976c9f96c7fa..dc4f6685cff5c527cc14dde4bcdcbcb504fd3d84 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -90,22 +90,18 @@ pipeline { sudo -H pip install -r requirements.txt """.stripIndent()) - lock(resource: "conanCache-${env.NODE_NAME}") { - sh 'conan user' - sh 'find $CONAN_USER_HOME -name "system_reqs.txt" -exec rm {} \\;' - configure { - cmakeOptions = - '-DOGS_USE_CONAN=ON ' + - '-DOGS_CONAN_BUILD=never ' + - '-DOGS_CPU_ARCHITECTURE=generic ' + - '-DDOCS_GENERATE_LOGFILE=ON ' // redirects to build/DoxygenWarnings.log - } + sh 'conan user' + configure { + cmakeOptions = + '-DOGS_USE_CONAN=ON ' + + '-DOGS_CONAN_BUILD=never ' + + '-DOGS_CPU_ARCHITECTURE=generic ' + + '-DDOCS_GENERATE_LOGFILE=ON ' // redirects to build/DoxygenWarnings.log } build { } build { target="tests" } build { target="ctest" } build { target="doc" } - sh 'find $CONAN_USER_HOME -name "system_reqs.txt" -exec rm {} \\;' configure { cmakeOptions = '-DOGS_BUILD_CLI=OFF ' + diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full index a41ac0f8adb9f83edb4ed8b0ee4c7d0e2c8288df..5574b5c6db82fa3fd0f10745f524f4e69e625e8c 100644 --- a/scripts/docker/Dockerfile.gcc.full +++ b/scripts/docker/Dockerfile.gcc.full @@ -36,7 +36,6 @@ ENV CCACHE_DIR=/home/jenkins/cache/ccache RUN mkdir -p $CCACHE_DIR ENV CCACHE_MAXSIZE=15G ENV CCACHE_SLOPPINESS=pch_defines,time_macros -ENV CONAN_USER_HOME=/home/jenkins/cache/conan WORKDIR /home/jenkins RUN conan user