Merge branch 'hotfix/2.10.2'

driplineorg · Feb 1, 2025 · ff11686 · ff11686
2 parents 88e23fa + b149a31
commit ff11686
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
@@ -143,7 +143,7 @@ jobs:
             libyaml-cpp-dev
           git clone https://github.com/odygrd/quill.git
           cd quill
-          git checkout v7.3.0
+          git checkout v8.1.0
           mkdir build
           cd build
           sudo cmake ..

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,7 +6,7 @@ cmake_minimum_required (VERSION 3.12)
 #########
 
 cmake_policy( SET CMP0048 NEW ) # version in project()
-project( Dripline VERSION 2.10.1 )
+project( Dripline VERSION 2.10.2 )
 
 list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/scarab/cmake )
 

diff --git a/Dockerfile b/Dockerfile
@@ -42,7 +42,7 @@ RUN cd /usr/local && \
     rm -rf /usr/local/pybind11
 
 # use quill_checkout to specify a tag or branch name to checkout
-ARG quill_checkout=v7.3.0
+ARG quill_checkout=v8.1.0
 RUN cd /usr/local && \
     git clone https://github.com/odygrd/quill.git && \
     cd quill && \

diff --git a/scarab b/scarab
+21 −4		.github/workflows/run_tests.yaml
+1 −1		VERSION
+5 −5		library/logger/logger.cc