diff --git a/Jenkinsfile b/Jenkinsfile index 03e078666726f722b5b24043da554519aa0c0973..35f2f18c9c501214f19d4148c8c0bc873e8013b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -156,20 +156,15 @@ pipeline { } } steps { - script { - 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_CPU_ARCHITECTURE=generic ' - config = 'Debug' - } - } - build { } - build { target = 'tests' } + sh 'conan user' + configure { + cmakeOptions = + '-DOGS_USE_CONAN=ON ' + + '-DOGS_CPU_ARCHITECTURE=generic ' + config = 'Debug' } + build { } + build { target = 'tests' } } post { always { publishReports { } } diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index f0aa58133cae498dff3355d01be0b1fa1aa9e419..ab867da24e3424e82b1f2ce5b29e4cef8c95ee08 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -52,7 +52,6 @@ find_program(HUGO hugo) find_program(NPM npm) find_program(YARN yarn) find_program(PIP pip) -find_package(PythonInterp) find_program(PANDOC_CITEPROC pandoc-citeproc) find_program(MODULE_CMD modulecmd @@ -64,8 +63,6 @@ find_program(MODULE_CMD modulecmd find_package(Boost REQUIRED) include_directories(SYSTEM ${Boost_INCLUDE_DIRS}) -include(VtkModules) -#find_package(VTK COMPONENTS ${VTK_MODULES} REQUIRED) find_package(VTK 8.1.0 REQUIRED) include(${VTK_USE_FILE}) diff --git a/scripts/cmake/VtkModules.cmake b/scripts/cmake/VtkModules.cmake deleted file mode 100644 index 6ddd41b9fe4f0f4f0d0112cde3a34117aac1a711..0000000000000000000000000000000000000000 --- a/scripts/cmake/VtkModules.cmake +++ /dev/null @@ -1,33 +0,0 @@ -# CLI modules -set(VTK_MODULES - vtkIOXML - CACHE INTERNAL "Required VTK / ParaView modules" -) - -if(OGS_USE_MPI) - set(VTK_MODULES ${VTK_MODULES} vtkIOParallelXML vtkParallelMPI) -endif() - -if(OGS_BUILD_GUI) - set(VTK_MODULES ${VTK_MODULES} - vtkRenderingCore - vtknetcdfcpp - vtkIOLegacy - vtkIOImage - vtkRenderingAnnotation - vtkFiltersExtraction - vtkFiltersGeometry - vtkFiltersTexture - vtkFiltersModeling - vtkFiltersSources - vtkImagingCore - vtkInteractionWidgets - vtkInteractionStyle - vtkIOExport - vtkRenderingFreeType - ) -endif() - -if(OGS_INSITU) - set(VTK_MODULES ${VTK_MODULES} vtkPVPythonCatalyst) -endif() diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full index 2fc700247fa4dde6ad3c8e4f9077d73ea1c7f587..f02e9c37c765fa350cf5ac5c853b7eec10062556 100644 --- a/scripts/docker/Dockerfile.gcc.full +++ b/scripts/docker/Dockerfile.gcc.full @@ -76,6 +76,6 @@ RUN curl https://include-what-you-use.org/downloads/include-what-you-use-0.8-x86 && tar xf include-what-you-use-0.8-x86_64-linux-gnu-ubuntu-16.04.tar.gz -C /usr/ --strip-components=1 \ && rm include-what-you-use-0.8-x86_64-linux-gnu-ubuntu-16.04.tar.gz -RUN apt-get install -y mesa-common-dev +RUN apt-get install -y mesa-common-dev wget USER jenkins