From 3884bbde863329e5445e2cd53a56fb439ecbc8e1 Mon Sep 17 00:00:00 2001 From: alra619 Date: Wed, 22 Jan 2025 16:19:50 -0800 Subject: [PATCH 1/4] update git submodule that supports quill version 8.0 --- scarab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scarab b/scarab index a68aec17..32b53bc2 160000 --- a/scarab +++ b/scarab @@ -1 +1 @@ -Subproject commit a68aec17f1c7090b4a7fc6df0fb9881b3103804c +Subproject commit 32b53bc277ff02e9aa501b0d2ed7a2790ab76155 From 04510537f9439d6b53243db5de7e7ef95edb0cc0 Mon Sep 17 00:00:00 2001 From: Noah Oblath Date: Fri, 31 Jan 2025 16:54:39 -0800 Subject: [PATCH 2/4] Updated Scarab to v3.11.5 --- scarab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scarab b/scarab index 32b53bc2..b6583756 160000 --- a/scarab +++ b/scarab @@ -1 +1 @@ -Subproject commit 32b53bc277ff02e9aa501b0d2ed7a2790ab76155 +Subproject commit b658375612bcc555791ffb8e7cd97bc1bcc76eb5 From 5970d3ad88bc70c4d0d794c60a06a9d16b50dc43 Mon Sep 17 00:00:00 2001 From: Noah Oblath Date: Fri, 31 Jan 2025 16:59:18 -0800 Subject: [PATCH 3/4] Update Quill version in Dockerfile and GHA workflow --- .github/workflows/publish.yaml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 3cce6ce3..721311b1 100644 --- 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/Dockerfile b/Dockerfile index b4de8078..d8428674 100644 --- 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 && \ From b149a3185496f17282c927a6a7c9c6feda8bca21 Mon Sep 17 00:00:00 2001 From: Noah Oblath Date: Fri, 31 Jan 2025 16:59:59 -0800 Subject: [PATCH 4/4] [no ci] Bump version to 2.10.2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8b06522..8f6fce6f 100644 --- 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 )