From b87a5fb45ff6a6a2c50ec4334f1dab86fc504949 Mon Sep 17 00:00:00 2001 From: Bertrand Kerautret Date: Mon, 26 Aug 2024 16:36:42 +0200 Subject: [PATCH] fix windows CI build --- .github/workflows/build.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b19c196..3217b78 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,18 +40,18 @@ 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 - + path: ~/.conan2 + key: ${{ runner.os }}-conan2-${{ matrix.BUILD_TYPE }} + - name: Create Build Environment run: cmake -E make_directory ${{runner.workspace}}/build @@ -110,7 +110,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