From 7bc6d2d4ab15c1cfa0b229170abace9b65be307c Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Fri, 6 Nov 2026 09:49:23 +1100 Subject: [PATCH 1/2] ci: install woad before xTests in dependent C/C++ workflows xTests 0.29 exports a static link on woad, so find_package(xTests) fails unless woad is already installed. Add woad immediately before xTests in each workflow that installs xTests and did not already do so, and move libCLImate's existing woad entry ahead of xTests. --- .github/workflows/ci-cell.yml | 4 ++-- .github/workflows/ci.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-cell.yml b/.github/workflows/ci-cell.yml index 64c4ead..d283b30 100644 --- a/.github/workflows/ci-cell.yml +++ b/.github/workflows/ci-cell.yml @@ -51,13 +51,13 @@ jobs: mingw-w64-x86_64-cmake mingw-w64-x86_64-make - - name: Install test dependencies (STLSoft + shwild + xTests) + - name: Install test dependencies (STLSoft + shwild + woad + xTests) uses: ./.github/actions/install-sis-deps with: build-type: ${{ inputs.build-type }} c-compiler: ${{ inputs.c-compiler }} cpp-compiler: ${{ inputs.cpp-compiler }} - dependencies: STLSoft shwild xTests + dependencies: STLSoft shwild woad xTests toolchain: ${{ inputs.toolchain }} - name: Configure via prepare_cmake.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c13c39b..5f6c82d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -262,13 +262,13 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Install test dependencies (STLSoft + shwild + xTests) + - name: Install test dependencies (STLSoft + shwild + woad + xTests) uses: ./.github/actions/install-sis-deps with: build-type: ${{ env.BUILD_TYPE }} c-compiler: gcc cpp-compiler: g++ - dependencies: STLSoft shwild xTests + dependencies: STLSoft shwild woad xTests - name: Configure via prepare_cmake.sh --no-cpp shell: bash @@ -300,13 +300,13 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Install test dependencies (STLSoft + shwild + xTests) + - name: Install test dependencies (STLSoft + shwild + woad + xTests) uses: ./.github/actions/install-sis-deps with: build-type: ${{ env.BUILD_TYPE }} c-compiler: gcc cpp-compiler: g++ - dependencies: STLSoft shwild xTests + dependencies: STLSoft shwild woad xTests - name: Configure via prepare_cmake.sh --wide-strings shell: bash From fa06cca067ea499b6e4562b3d63b954e9c50028f Mon Sep 17 00:00:00 2001 From: Matt Wilson Date: Fri, 6 Nov 2026 10:21:09 +1100 Subject: [PATCH 2/2] docs: record 6th November 2026 releases after the woad CI change --- CHANGES.md | 10 ++++++++++ Doxyfile | 2 +- NEWS.md | 1 + include/cstring/cstring.h | 7 ++++--- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 6640f0e..618c31f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,16 @@ # cstring - Changes +## 4.1.0-beta6 - 6th November 2026 + +* version: + * added `CSTRING_VER_4_1_0_B6`; +* build: + * CI installs **woad** before **xTests**, which **xTests** 0.29 requires; +* documentation and boilerplate: + * **Doxyfile** `PROJECT_NUMBER` is **4.1.0-beta6**; + + ## 4.1.0-beta5 - 3rd November 2026 * renamed **examples/cpp/cstring.dynload** => **examples/cpp/windows.dyamic-load**; diff --git a/Doxyfile b/Doxyfile index b9ff2de..4c0ca69 100644 --- a/Doxyfile +++ b/Doxyfile @@ -2,7 +2,7 @@ PROJECT_NAME = "cstring" PROJECT_BRIEF = "Extensible C-style strings and vectors of such, for Unix and Windows" -PROJECT_NUMBER = 4.1.0-beta4 +PROJECT_NUMBER = 4.1.0-beta6 # Prefer SIS_CMAKE_BUILD_DIR-aligned output (same convention as Diagnosticism). # ./dox/ remains gitignored for legacy/local runs that override OUTPUT_DIRECTORY. OUTPUT_DIRECTORY = _build/doxygen diff --git a/NEWS.md b/NEWS.md index 4f24825..225cbad 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,7 @@ | Date | News Item | Details | | ------------------- | ------------------------------------ | ------- | | Available from [**cstring** project on GitHub](https://synesissoftware.com/cstring): | +| 6th November 2026 | Release of [cstring 4.1.0-beta6](https://github.com/synesissoftware/cstring/releases/tag/4.1.0-beta6) | CI installs **woad** before **xTests**; **Doxyfile** `PROJECT_NUMBER` | | 3rd November 2026 | Release of [cstring 4.1.0-beta5](https://github.com/synesissoftware/cstring/releases/tag/4.1.0-beta5) | directory renames | | 2nd November 2026 | Release of [cstring 4.1.0-beta4](https://github.com/synesissoftware/cstring/releases/tag/4.1.0-beta4) | **STLSoft** **1.11.5**; **xTests** **0.28.2** | | 1st November 2026 | Release of [cstring 4.1.0-beta3](https://github.com/synesissoftware/cstring/releases/tag/4.1.0-beta3) | `File:` labels use the project-relative path; **Check test names** | diff --git a/include/cstring/cstring.h b/include/cstring/cstring.h index 8ce1b70..37d96c5 100644 --- a/include/cstring/cstring.h +++ b/include/cstring/cstring.h @@ -4,7 +4,7 @@ * Purpose: Definition of the cstring.core API. * * Created: 16th June 1994 - * Updated: 2nd November 2026 + * Updated: 6th November 2026 * * Home: http://synesis.com.au/software/ * @@ -56,7 +56,7 @@ # define CSTRING_VER_CSTRING_H_CSTRING_MAJOR 3 # define CSTRING_VER_CSTRING_H_CSTRING_MINOR 13 # define CSTRING_VER_CSTRING_H_CSTRING_REVISION 4 -# define CSTRING_VER_CSTRING_H_CSTRING_EDIT 107 +# define CSTRING_VER_CSTRING_H_CSTRING_EDIT 108 #endif /* !CSTRING_DOCUMENTATION_SKIP_SECTION */ @@ -111,6 +111,7 @@ # define CSTRING_VER_4_1_0_B3 0x04010083 # define CSTRING_VER_4_1_0_B4 0x04010084 # define CSTRING_VER_4_1_0_B5 0x04010085 +# define CSTRING_VER_4_1_0_B6 0x04010086 #endif /* !CSTRING_DOCUMENTATION_SKIP_SECTION */ /** \def CSTRING_VER_MAJOR @@ -136,7 +137,7 @@ #define CSTRING_VER_MAJOR 4 #define CSTRING_VER_MINOR 1 #define CSTRING_VER_PATCH 0 -#define CSTRING_VER_RELSTATUS 0x85 +#define CSTRING_VER_RELSTATUS 0x86 #define CSTRING_VER \ (0\