diff --git a/.github/workflows/actions/install_local_dependencies/action.yaml b/.github/workflows/actions/install_local_dependencies/action.yaml index ae71f95a..5ab2a9cc 100644 --- a/.github/workflows/actions/install_local_dependencies/action.yaml +++ b/.github/workflows/actions/install_local_dependencies/action.yaml @@ -14,16 +14,16 @@ runs: echo Download range-v3 cd ~ - wget https://github.com/ericniebler/range-v3/archive/0.11.0.tar.gz -O range-v3-0.11.0.tar.gz - if [ $(sha512sum range-v3-0.11.0.tar.gz | awk '{print $1;}') == "9d6cdcbc1e50104206ba731c3bdc9aab3acfcf69cd83f0e0b4de18b88df2a9e73d64e55638421768d4433c542b6619f6e5af6b17cccd3090cf8b4d4efe9863e4" ]; then + wget https://github.com/ericniebler/range-v3/archive/0.12.0.tar.gz -O range-v3-0.12.0.tar.gz + if [ $(sha512sum range-v3-0.11.0.tar.gz | awk '{print $1;}') == "b8b632b8e0f2a3234ef61813212c237f648cd741e816ca57bd86f82f6459f7d755e2b70361d2aa43847874fb546a31a792ab1c3ba90292818ae7313438dc62d0" ]; then echo Correct sha512sum else echo Wrong sha512sum - sha512sum range-v3-0.11.0.tar.gz + sha512sum range-v3-0.12.0.tar.gz exit 1 fi - tar -xvf range-v3-0.11.0.tar.gz - cd range-v3-0.11.0/ + tar -xvf range-v3-0.12.0.tar.gz + cd range-v3-0.12.0/ echo Install range-v3 mkdir build @@ -32,8 +32,8 @@ runs: make -j$NUMCORES sudo make install cd ~ - rm -rf range-v3-0.11.0 - rm range-v3-0.11.0.tar.gz + rm -rf range-v3-0.12.0 + rm range-v3-0.12.0.tar.gz echo Download spdlog cd ~ diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index ecc6a515..4743f942 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -563,7 +563,7 @@ jobs: aws-secret-access-key: qqqE8j/73w2EEJ984rVvxbDzdvnL93hk3X5ba1ac aws-region: eu-west-1 bucket: ci-cache.cryfs - key: v1-${{ runner.os }}-${{ matrix.os }}-conancache__${{matrix.compiler.cxx}}__${{matrix.compiler.cc}}__${{matrix.build_type}}__ + key: v3-${{ runner.os }}-${{ matrix.os }}-conancache__${{matrix.compiler.cxx}}__${{matrix.compiler.cc}}__${{matrix.build_type}}__ - name: Build shell: bash run: | @@ -613,7 +613,7 @@ jobs: aws-secret-access-key: ${{ secrets.CACHE_AWS_SECRET_ACCESS_KEY }} aws-region: eu-west-1 bucket: ci-cache.cryfs - key: v1-${{ runner.os }}-${{ matrix.os }}-conancache__${{matrix.compiler.cxx}}__${{matrix.compiler.cc}}__${{matrix.build_type}}__ + key: v3-${{ runner.os }}-${{ matrix.os }}-conancache__${{matrix.compiler.cxx}}__${{matrix.compiler.cc}}__${{matrix.build_type}}__ artifacts: | ${{ env.CONAN_USER_HOME }} ${{ env.CONAN_USER_HOME_SHORT }} diff --git a/ChangeLog.txt b/ChangeLog.txt index d04c3b3f..1e40edbf 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,8 +1,10 @@ Version 0.12.0 (unreleased) --------------- -* Updated to DokanY 1.3.0.1000 * Added a man page for `cryfs-unmount` * Fixed small inaccuracy in calculation of free space in statvfs +* Updated dependencies to + * DokanY 1.3.0.1000 + * range-v3/0.12.0 Version 0.11.4 (unreleased) --------------- diff --git a/conanfile.py b/conanfile.py index 42694d8b..829493e5 100644 --- a/conanfile.py +++ b/conanfile.py @@ -3,7 +3,7 @@ from conan import ConanFile class CryFSConan(ConanFile): settings = "os", "compiler", "build_type", "arch" requires = [ - "range-v3/0.11.0", + "range-v3/0.12.0", "spdlog/1.8.5", "boost/1.75.0", ]