Merge branch 'master' into Add-project-status-to-README-to-set-expectations

Author: baylesj

.github/workflows/update-project-version.yml

@@ -4,56 +4,94 @@ on:
   workflow_dispatch:
     inputs:
       target_version:
-        description: 'Next Version (e.g., 1.9.7)'
+        description: 'next version (e.g., 1.9.7 or 1.9.7.12)'
         required: true
         default: '1.9.7'
+      target_soversion:
+        description: 'next soversion (e.g., 28). leave blank to keep current.'
+        required: false
 
 jobs:
-  create-bump-pr:
+  bump-and-verify:
     runs-on: ubuntu-latest
     permissions:
       contents: write
       pull-requests: write
     steps:
-      - name: Checkout code
+      - name: checkout code
         uses: actions/checkout@v4
 
-      - name: Update Project Files
+      - name: update project files
         id: update_files
         run: |
           VER="${{ github.event.inputs.target_version }}"
-          echo "Updating files to $VER"
+          SOVER="${{ github.event.inputs.target_soversion }}"
+          echo "bumping version to $VER"
 
           # 1. CMakeLists.txt
-          sed -i "s/VERSION [0-9.]*/VERSION $VER/" CMakeLists.txt
+          if [ -f CMakeLists.txt ]; then
+            echo "updating cmakelists.txt"
+            # match VERSION only within the project block
+            sed -i "/project[[:space:]]*([[:space:]]*jsoncpp/,/)/ s/VERSION [0-9.]*/VERSION $VER/" CMakeLists.txt
+            if [ -n "$SOVER" ]; then
+              sed -i "s/set(PROJECT_SOVERSION [0-9]*/set(PROJECT_SOVERSION $SOVER/" CMakeLists.txt
+            fi
+          fi
 
           # 2. meson.build
-          sed -i "s/version : '[0-9.]*'/version : '$VER'/" meson.build
+          if [ -f meson.build ]; then
+            echo "updating meson.build"
+            # match version : 'x.y.z' with flexible quotes and spacing
+            sed -i "s/version[[:space:]]*:[[:space:]]*['\"][0-9.]*['\"]/version : '$VER'/" meson.build
+            if [ -n "$SOVER" ]; then
+              # matches soversion : '26'
+              sed -i "s/soversion[[:space:]]*:[[:space:]]*['\"][0-9]*['\"]/soversion : '$SOVER'/" meson.build
+            fi
+          fi
 
-          # 3. vcpkg.json (Using jq for safety)
-          jq ".version = \"$VER\"" vcpkg.json > vcpkg.json.tmp && mv vcpkg.json.tmp vcpkg.json
+          # 3. vcpkg.json
+          if [ -f vcpkg.json ]; then
+            echo "updating vcpkg.json"
+            jq ".version = \"$VER\"" vcpkg.json > vcpkg.json.tmp && mv vcpkg.json.tmp vcpkg.json
+          fi
 
           # 4. include/json/version.h
-          # Parse X.Y.Z into separate variables
-          IFS='.' read -r MAJOR MINOR PATCH <<< "$VER"
-          sed -i "s/# define JSONCPP_VERSION_STRING \"[^\"]*\"/# define JSONCPP_VERSION_STRING \"$VER\"/" include/json/version.h
-          sed -i "s/# define JSONCPP_VERSION_MAJOR [0-9]*/# define JSONCPP_VERSION_MAJOR $MAJOR/" include/json/version.h
-          sed -i "s/# define JSONCPP_VERSION_MINOR [0-9]*/# define JSONCPP_VERSION_MINOR $MINOR/" include/json/version.h
-          sed -i "s/# define JSONCPP_VERSION_PATCH [0-9]*/# define JSONCPP_VERSION_PATCH $PATCH/" include/json/version.h
-
-      - name: Create Pull Request
+          if [ -f include/json/version.h ]; then
+            echo "updating version.h"
+            # 1.9.7.12 -> MAJOR=1, MINOR=9, PATCH=7, QUALIFIER=12
+            IFS='.' read -r MAJOR MINOR PATCH QUALIFIER <<< "$VER"
+            
+            sed -i "s|#define JSONCPP_VERSION_STRING \"[^\"]*\"|#define JSONCPP_VERSION_STRING \"$VER\"|" include/json/version.h
+            sed -i "s|#define JSONCPP_VERSION_MAJOR [0-9]*|#define JSONCPP_VERSION_MAJOR $MAJOR|" include/json/version.h
+            sed -i "s|#define JSONCPP_VERSION_MINOR [0-9]*|#define JSONCPP_VERSION_MINOR $MINOR|" include/json/version.h
+            sed -i "s|#define JSONCPP_VERSION_PATCH [0-9]*|#define JSONCPP_VERSION_PATCH $PATCH|" include/json/version.h
+            
+            if [ -n "$QUALIFIER" ]; then
+              sed -i "s|#define JSONCPP_VERSION_QUALIFIER.*|#define JSONCPP_VERSION_QUALIFIER $QUALIFIER|" include/json/version.h
+            else
+              sed -i "s|#define JSONCPP_VERSION_QUALIFIER.*|#define JSONCPP_VERSION_QUALIFIER|" include/json/version.h
+            fi
+          fi
+
+      - name: sanity check (cmake configure)
+        run: |
+          if [ -f CMakeLists.txt ]; then
+            mkdir build_check
+            cd build_check
+            cmake .. -DJSONCPP_WITH_TESTS=OFF -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF
+            cd ..
+            rm -rf build_check
+          fi
+
+      - name: create pull request
         uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           commit-message: "chore: bump version to ${{ github.event.inputs.target_version }}"
           branch: "bump-to-${{ github.event.inputs.target_version }}"
           title: "chore: bump version to ${{ github.event.inputs.target_version }}"
           body: |
-            Manual version bump to `${{ github.event.inputs.target_version }}` to start the next development cycle.
-            
-            **Files updated:**
-            - `CMakeLists.txt`
-            - `meson.build`
-            - `vcpkg.json`
-            - `include/json/version.h`
+            automated version bump.
+            - new version: `${{ github.event.inputs.target_version }}`
+            - new soversion: `${{ github.event.inputs.target_soversion || 'no change' }}`
           labels: "maintenance"