From e6fae3f619fd8c7051cfdda830787db6a4b5614f Mon Sep 17 00:00:00 2001 From: Bertrand Kerautret Date: Mon, 26 Aug 2024 16:36:42 +0200 Subject: [PATCH 1/5] fix windows CI build --- .github/workflows/build.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b19c196..af0080d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,17 +40,17 @@ jobs: id: conan uses: turtlebrowser/get-conan@main with: - version: 1.57.0 + version: 2.4.0 - name: Create conan default profile if: matrix.os == 'windows-latest' - run: conan profile new default --detect + run: conan profile detect --force - - uses: actions/cache@v3 + - uses: actions/cache@v4 if: matrix.os == 'windows-latest' with: path: ~/.conan - key: ${{ runner.os }}-conan-Release + key: ${{ runner.os }}-conan2-Release - name: Create Build Environment @@ -82,17 +82,19 @@ jobs: echo cmake .. $CONFIG_MAC -DBUILD_EXAMPLES=false -DBUILD_TESTING=false -G Ninja cmake .. $CONFIG_MAC -DBUILD_EXAMPLES=false -DBUILD_TESTING=false -G Ninja ninja + - name: DGtalBuild (windows) if: matrix.os == 'windows-latest' shell: bash working-directory: ${{runner.workspace}}/build run: | + conan install $GITHUB_WORKSPACE --build=missing git clone --depth 1 https://github.com/DGtal-team/DGtal.git cd DGtal mkdir buildDGtal cd buildDGtal - echo cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DBUILD_EXAMPLES=false -DBUILD_TESTING=false - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DBUILD_EXAMPLES=false -DBUILD_TESTING=false + echo cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DBUILD_EXAMPLES=false -DBUILD_TESTING=false + cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DBUILD_EXAMPLES=false -DBUILD_TESTING=false cmake --build . --config Release --parallel 3 - name: Configure CMake (linux) @@ -110,7 +112,9 @@ jobs: if: matrix.os == 'windows-latest' shell: bash working-directory: "${{runner.workspace}}/build" - run: cmake $GITHUB_WORKSPACE -DCMAKE_MODULE_PATH="D:/a/DGtalTools-contrib/build/DGtal/buildDGtal" -DDGtal_DIR="D:/a/DGtalTools-contrib/build/DGtal/buildDGtal" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}" + run: | + conan install $GITHUB_WORKSPACE --build=missing + cmake $GITHUB_WORKSPACE -DCMAKE_MODULE_PATH="D:/a/DGtalTools-contrib/build/DGtal/buildDGtal" -DDGtal_DIR="D:/a/DGtalTools-contrib/build/DGtal/buildDGtal" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}" - name: Build working-directory: ${{runner.workspace}}/build From 4c5dd3908924c90575c8391f71f94e2f15970bc6 Mon Sep 17 00:00:00 2001 From: Bertrand Kerautret Date: Mon, 26 Aug 2024 17:17:23 +0200 Subject: [PATCH 2/5] add conan config file from DGtal --- conanfile.txt | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 conanfile.txt diff --git a/conanfile.txt b/conanfile.txt new file mode 100644 index 0000000..7a96e48 --- /dev/null +++ b/conanfile.txt @@ -0,0 +1,14 @@ +[requires] +fmt/9.1.0 +zlib/1.2.13 +boost/1.81.0 +gmp/6.3.0 +fftw/3.3.9 + +[generators] +CMakeDeps +CMakeToolchain + +[options] +boost*:header_only=True +gmp*:enable_cxx=True From 57bc2760e48c0b87faaa1bad32671e78fb15cfd5 Mon Sep 17 00:00:00 2001 From: Bertrand Kerautret Date: Mon, 26 Aug 2024 17:23:00 +0200 Subject: [PATCH 3/5] follow conf from DGtal --- .github/workflows/build.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index af0080d..91189d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ env: CONFIG_GLOBAL: CONFIG_LINUX: -DWITH_MAGICK=true -DWITH_GMP=true -DWITH_FFTW3=true -DWARNING_AS_ERROR=ON -DWITH_HDF5=true -DWITH_QGLVIEWER=true -DWITH_CAIRO=true -DWITH_EIGEN=true -DDGTAL_ENABLE_FLOATING_POINT_EXCEPTIONS=true CONFIG_MAC: -DWITH_EIGEN=true -DWITH_GMP=tue - CONFIG_WINDOWS: -DWITH_OPENMP=true -DENABLE_CONAN=true + CONFIG_WINDOWS: -DWITH_OPENMP=true jobs: build: @@ -44,12 +44,14 @@ jobs: - name: Create conan default profile if: matrix.os == 'windows-latest' - run: conan profile detect --force - + run: | + conan profile detect --force + + - uses: actions/cache@v4 if: matrix.os == 'windows-latest' with: - path: ~/.conan + path: ~/.conan2 key: ${{ runner.os }}-conan2-Release @@ -88,13 +90,13 @@ jobs: shell: bash working-directory: ${{runner.workspace}}/build run: | - conan install $GITHUB_WORKSPACE --build=missing git clone --depth 1 https://github.com/DGtal-team/DGtal.git cd DGtal + conan install . --build=missing mkdir buildDGtal cd buildDGtal - echo cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DBUILD_EXAMPLES=false -DBUILD_TESTING=false - cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DBUILD_EXAMPLES=false -DBUILD_TESTING=false + echo cmake .. -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DBUILD_EXAMPLES=false -DBUILD_TESTING=false + cmake .. -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=$BUILD_TYPE $CONFIG_WINDOWS -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DBUILD_EXAMPLES=false -DBUILD_TESTING=false cmake --build . --config Release --parallel 3 - name: Configure CMake (linux) @@ -114,7 +116,7 @@ jobs: working-directory: "${{runner.workspace}}/build" run: | conan install $GITHUB_WORKSPACE --build=missing - cmake $GITHUB_WORKSPACE -DCMAKE_MODULE_PATH="D:/a/DGtalTools-contrib/build/DGtal/buildDGtal" -DDGtal_DIR="D:/a/DGtalTools-contrib/build/DGtal/buildDGtal" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}" + cmake $GITHUB_WORKSPACE -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MODULE_PATH="D:/a/DGtalTools-contrib/build/DGtal/buildDGtal" -DDGtal_DIR="D:/a/DGtalTools-contrib/build/DGtal/buildDGtal" -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DDGTAL_RANDOMIZED_TESTING_WHITELIST="${{ steps.whitelist.outputs.WHITELIST }}" - name: Build working-directory: ${{runner.workspace}}/build From 37490542ee3b8ba58d4b093a2876af1a8a06c751 Mon Sep 17 00:00:00 2001 From: Bertrand Kerautret Date: Mon, 26 Aug 2024 23:21:07 +0200 Subject: [PATCH 4/5] changelog --- ChangeLog.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ChangeLog.md b/ChangeLog.md index cad6745..1717927 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,8 @@ # DGtalTools-contrib 1.5 (beta) +- *global* + - Continuous integration fix on update on conan version following DGtal. + (Bertrand Kerautret [#90](https://github.com/DGtal-team/DGtalTools-contrib/pull/90)) From a4eafa9f0de4a6ac9c5709e22e8c7cec25b4def4 Mon Sep 17 00:00:00 2001 From: Bertrand Kerautret Date: Mon, 26 Aug 2024 23:27:05 +0200 Subject: [PATCH 5/5] changelog --- ChangeLog.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 1717927..b55c2ba 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,8 +1,8 @@ # DGtalTools-contrib 1.5 (beta) - *global* - - Continuous integration fix on update on conan version following DGtal. - (Bertrand Kerautret [#90](https://github.com/DGtal-team/DGtalTools-contrib/pull/90)) + - Continuous integration fix using new version on conan following DGtal changes. + (Bertrand Kerautret [#90](https://github.com/DGtal-team/DGtalTools-contrib/pull/90))