From c0be043aaf0ee7cba3300642803de83976c7da3e Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 13 Dec 2023 14:43:07 -0600 Subject: [PATCH 1/4] Replease UNRELEASED --- documentation/release_notes.dox | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/documentation/release_notes.dox b/documentation/release_notes.dox index 6e2927f..25d30a9 100644 --- a/documentation/release_notes.dox +++ b/documentation/release_notes.dox @@ -2,11 +2,12 @@ @page release_notes Release Notes -Release 8.0.6 (UNRELEASED) +Release 8.0.6 (Dec 2023) ======================== - Compatible changes - Actually enable JSON-5 output in PVStructure::Formatter::JSON when available. + - Fix unaligned access issues for some ARM/Linux targets. Release 8.0.5 (Sep 2022) ======================== From 0ef8a361721bc4972743a9c9a0112f441ba36b0f Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 13 Dec 2023 14:46:12 -0600 Subject: [PATCH 2/4] Set version numbers for release --- Doxyfile | 2 +- configure/CONFIG_PVDATA_VERSION | 2 +- documentation/Doxyfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doxyfile b/Doxyfile index 5e8247a..b88f11c 100644 --- a/Doxyfile +++ b/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "PVData C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 8.0.6-dev +PROJECT_NUMBER = 8.0.6 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/configure/CONFIG_PVDATA_VERSION b/configure/CONFIG_PVDATA_VERSION index 1def5e6..5483cc1 100644 --- a/configure/CONFIG_PVDATA_VERSION +++ b/configure/CONFIG_PVDATA_VERSION @@ -6,7 +6,7 @@ EPICS_PVD_MAINTENANCE_VERSION = 6 # Development flag, set to zero for release versions -EPICS_PVD_DEVELOPMENT_FLAG = 1 +EPICS_PVD_DEVELOPMENT_FLAG = 0 # Immediately after a release the MAINTENANCE_VERSION # will be incremented and the DEVELOPMENT_FLAG set to 1 diff --git a/documentation/Doxyfile b/documentation/Doxyfile index 56a1be5..5c884e0 100644 --- a/documentation/Doxyfile +++ b/documentation/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "PVData C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 8.0.6-dev +PROJECT_NUMBER = 8.0.6 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a From 7300e6b0bd560c0ea2355c64ea3a88c259f90fe2 Mon Sep 17 00:00:00 2001 From: Andrew Johnson Date: Wed, 13 Dec 2023 14:52:07 -0600 Subject: [PATCH 3/4] Set next development version --- Doxyfile | 2 +- configure/CONFIG_PVDATA_VERSION | 4 ++-- documentation/Doxyfile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Doxyfile b/Doxyfile index b88f11c..058e148 100644 --- a/Doxyfile +++ b/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "PVData C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 8.0.6 +PROJECT_NUMBER = 8.0.7-dev # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/configure/CONFIG_PVDATA_VERSION b/configure/CONFIG_PVDATA_VERSION index 5483cc1..c23c6e0 100644 --- a/configure/CONFIG_PVDATA_VERSION +++ b/configure/CONFIG_PVDATA_VERSION @@ -2,11 +2,11 @@ EPICS_PVD_MAJOR_VERSION = 8 EPICS_PVD_MINOR_VERSION = 0 -EPICS_PVD_MAINTENANCE_VERSION = 6 +EPICS_PVD_MAINTENANCE_VERSION = 7 # Development flag, set to zero for release versions -EPICS_PVD_DEVELOPMENT_FLAG = 0 +EPICS_PVD_DEVELOPMENT_FLAG = 1 # Immediately after a release the MAINTENANCE_VERSION # will be incremented and the DEVELOPMENT_FLAG set to 1 diff --git a/documentation/Doxyfile b/documentation/Doxyfile index 5c884e0..92eeff4 100644 --- a/documentation/Doxyfile +++ b/documentation/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "PVData C++" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 8.0.6 +PROJECT_NUMBER = 8.0.7-dev # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a From 144f0228cc412d2dc1eaad7e09e310697d18532f Mon Sep 17 00:00:00 2001 From: Ralph Lange Date: Fri, 15 Dec 2023 09:40:45 +0100 Subject: [PATCH 4/4] ci: update ci-scripts to v3.4.1 --- .ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci b/.ci index 899b183..20f8e05 160000 --- a/.ci +++ b/.ci @@ -1 +1 @@ -Subproject commit 899b18336b4ce3bd9328fd30c33621224c78a4d7 +Subproject commit 20f8e053931fdef8a9413cc6229286c5d9ed152f