diff --git a/.github/workflows/actions/install_local_dependencies/action.yaml b/.github/workflows/actions/install_local_dependencies/action.yaml index 2cc1b842..0dff9a57 100644 --- a/.github/workflows/actions/install_local_dependencies/action.yaml +++ b/.github/workflows/actions/install_local_dependencies/action.yaml @@ -37,8 +37,8 @@ runs: echo Download spdlog cd ~ - wget https://github.com/gabime/spdlog/archive/v1.8.5.tar.gz -O spdlog.tar.gz - if [ $(sha512sum spdlog.tar.gz | awk '{print $1;}') == "77cc9df0c40bbdbfe1f3e5818dccf121918bfceac28f2608f39e5bf944968b7e8e24a6fc29f01bc58a9bae41b8892d49cfb59c196935ec9868884320b50f130c" ]; then + wget https://github.com/gabime/spdlog/archive/refs/tags/v1.11.0.tar.gz -O spdlog.tar.gz + if [ $(sha512sum spdlog.tar.gz | awk '{print $1;}') == "210f3135c7af3ec774ef9a5c77254ce172a44e2fa720bf590e1c9214782bf5c8140ff683403a85b585868bc308286fbdeb1c988e4ed1eb3c75975254ffe75412" ]; then echo Correct sha512sum else echo Wrong sha512sum @@ -47,7 +47,7 @@ runs: fi tar -xvf spdlog.tar.gz rm spdlog.tar.gz - cd spdlog-1.8.5 + cd spdlog-1.11.0 echo Install spdlog mkdir build diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index c70c96b5..a0402662 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -176,7 +176,10 @@ jobs: compiler: {cxx: clang++-9, cc: clang-9, macos_cxx: /usr/local/opt/llvm@9/bin/clang++, macos_cc: /usr/local/opt/llvm@9/bin/clang, apt_package: clang-9, homebrew_package: llvm@9} - os: ubuntu-22.04 compiler: {cxx: clang++-10, cc: clang-10, macos_cxx: /usr/local/opt/llvm@10/bin/clang++, macos_cc: /usr/local/opt/llvm@10/bin/clang, apt_package: clang-10, homebrew_package: llvm@10} - # Clang 11 on Ubuntu seems to have a bug that fails CI + # Clang 11 on Ubuntu seems to have a bug that fails CI, see https://github.com/gabime/spdlog/issues/2812 + - os: ubuntu-20.04 + compiler: {cxx: clang++-11, cc: clang-11, macos_cxx: /usr/local/opt/llvm@11/bin/clang++, macos_cc: /usr/local/opt/llvm@11/bin/clang, apt_package: "clang-11 libomp5-11 libomp-11-dev", homebrew_package: llvm@11} + build_type: Debug - os: ubuntu-22.04 compiler: {cxx: clang++-11, cc: clang-11, macos_cxx: /usr/local/opt/llvm@11/bin/clang++, macos_cc: /usr/local/opt/llvm@11/bin/clang, apt_package: "clang-11 libomp5-11 libomp-11-dev", homebrew_package: llvm@11} build_type: Debug diff --git a/ChangeLog.txt b/ChangeLog.txt index ebdaed44..94d7737a 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -6,6 +6,7 @@ Version 0.12.0 (unreleased) * DokanY 2.0.6.1000 * range-v3/0.12.0 * boost 1.79 + * spdlog/1.11.0 Version 0.11.4 (unreleased) --------------- diff --git a/conanfile.py b/conanfile.py index e8d4a4cb..0b91e80f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -4,7 +4,7 @@ class CryFSConan(ConanFile): settings = "os", "compiler", "build_type", "arch" requires = [ "range-v3/0.12.0", - "spdlog/1.8.5", + "spdlog/1.11.0", "boost/1.79.0", ] generators = "cmake"