diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b19c196..143ba04 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 @@ -60,7 +60,7 @@ jobs: - name: DGtalBuild (linux) if: matrix.os == 'ubuntu-latest' shell: bash - working-directory: ${{runner.workspace}}/build + working-directory: ${{runner.workspace}}/buildx run: | git clone --depth 1 https://github.com/DGtal-team/DGtal.git cd DGtal @@ -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