Compare commits

..

No commits in common. "6198908e861c9617773fc0c6fbf5d3f08c210dc7" and "9845175dca8f76d68a1af0044aa91bfc3b502d18" have entirely different histories.

4 changed files with 6 additions and 11 deletions

View File

@ -256,7 +256,7 @@ jobs:
if [[ "${{matrix.os}}" == "ubuntu-18.04" ]]; then if [[ "${{matrix.os}}" == "ubuntu-18.04" ]]; then
python3 -m pip install setuptools python3 -m pip install setuptools
fi fi
python3 -m pip install conan==1.59 python3 -m pip install conan
- name: Save pip cache - name: Save pip cache
# note: this access key has write access to the cache. This can't run on PRs. # note: this access key has write access to the cache. This can't run on PRs.
if: ${{github.event_name == 'push' }} if: ${{github.event_name == 'push' }}
@ -461,7 +461,7 @@ jobs:
shell: bash shell: bash
run: | run: |
# Using "python3 -m pip" instead of "pip3" to make sure we get the same pip that we queried the cache dir for the Github Cache action # Using "python3 -m pip" instead of "pip3" to make sure we get the same pip that we queried the cache dir for the Github Cache action
python3 -m pip install conan==1.59 python3 -m pip install conan
- name: Save pip cache - name: Save pip cache
# note: this access key has write access to the cache. This can't run on PRs. # note: this access key has write access to the cache. This can't run on PRs.
if: ${{github.event_name == 'push' }} if: ${{github.event_name == 'push' }}

View File

@ -1,7 +1,3 @@
Version 0.11.4 (unreleased)
---------------
* Fixed build issue on Fedora (see https://github.com/cryfs/cryfs/pull/448 )
Version 0.11.3 Version 0.11.3
--------------- ---------------
* Fixed build issue on systems with libfmt 9.0 (see https://github.com/cryfs/cryfs/issues/432 ) * Fixed build issue on systems with libfmt 9.0 (see https://github.com/cryfs/cryfs/issues/432 )

View File

@ -85,7 +85,7 @@ Requirements
- GCC version >= 7 or Clang >= 7 - GCC version >= 7 or Clang >= 7
- CMake version >= 3.10 - CMake version >= 3.10
- pkg-config (on Unix) - pkg-config (on Unix)
- Conan package manager (version 1.x) - Conan package manager
- libcurl4 (including development headers) - libcurl4 (including development headers)
- SSL development libraries (including development headers, e.g. libssl-dev) - SSL development libraries (including development headers, e.g. libssl-dev)
- libFUSE version >= 2.8.6 (including development headers), on Mac OS X instead install macFUSE from https://osxfuse.github.io/ - libFUSE version >= 2.8.6 (including development headers), on Mac OS X instead install macFUSE from https://osxfuse.github.io/
@ -96,15 +96,15 @@ You can use the following commands to install these requirements
# Ubuntu # Ubuntu
$ sudo apt install git g++ cmake make pkg-config libcurl4-openssl-dev libssl-dev libfuse-dev python python3-pip $ sudo apt install git g++ cmake make pkg-config libcurl4-openssl-dev libssl-dev libfuse-dev python python3-pip
$ sudo pip3 install conan==1.59 $ sudo pip3 install conan
# Fedora # Fedora
$ sudo dnf install git gcc-c++ cmake make pkgconf libcurl-devel openssl-devel fuse-devel python python3-pip $ sudo dnf install git gcc-c++ cmake make pkgconf libcurl-devel openssl-devel fuse-devel python python3-pip
$ sudo pip3 install conan==1.59 $ sudo pip3 install conan
# Macintosh # Macintosh
$ brew install cmake pkg-config openssl libomp macfuse $ brew install cmake pkg-config openssl libomp macfuse
$ sudo pip3 install conan==1.59 $ sudo pip3 install conan
Build & Install Build & Install
--------------- ---------------

View File

@ -4,7 +4,6 @@
#include <thread> #include <thread>
#include <cpp-utils/macros.h> #include <cpp-utils/macros.h>
#include <array> #include <array>
#include <stdexcept>
namespace cpputils { namespace cpputils {