From 3add48678296482a5140595a543432b1563b6f4b Mon Sep 17 00:00:00 2001
From: JCW <a1q123456@users.noreply.github.com>
Date: Thu, 11 Jun 2026 15:45:24 +0100
Subject: [PATCH] Fix PR comments

---
 .github/actions/build-deps/action.yml            |  8 ++------
 .github/scripts/strategy-matrix/generate.py      | 10 +++++++---
 .github/workflows/reusable-build-test-config.yml |  7 +++----
 .github/workflows/reusable-build-test.yml        |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/actions/build-deps/action.yml b/.github/actions/build-deps/action.yml
index 585d24692a..722679186b 100644
--- a/.github/actions/build-deps/action.yml
+++ b/.github/actions/build-deps/action.yml
@@ -38,15 +38,11 @@ runs:
         BUILD_TYPE: ${{ inputs.build_type }}
         LOG_VERBOSITY: ${{ inputs.log_verbosity }}
         SANITIZERS: ${{ inputs.sanitizers }}
-        COMPILER_VERSION: ${{ inputs.compiler_version }}
+        COMPILER_VERSION_SETTING: ${{ inputs.compiler_version != '' && format('--settings:all compiler.version={0}', inputs.compiler_version) || '' }}
       run: |
-        COMPILER_VERSION_SETTING=()
-        if [ -n "${COMPILER_VERSION}" ]; then
-            COMPILER_VERSION_SETTING=(--settings:all compiler.version="${COMPILER_VERSION}")
-        fi
         conan install \
             --profile:all ci \
-            "${COMPILER_VERSION_SETTING[@]}" \
+            ${COMPILER_VERSION_SETTING} \
             --build="${BUILD_OPTION}" \
             --options:host='&:tests=True' \
             --options:host='&:xrpld=True' \
diff --git a/.github/scripts/strategy-matrix/generate.py b/.github/scripts/strategy-matrix/generate.py
index 1dde94f2f0..d02c0c59ce 100755
--- a/.github/scripts/strategy-matrix/generate.py
+++ b/.github/scripts/strategy-matrix/generate.py
@@ -163,7 +163,7 @@ class MatrixEntry:
     sanitizers: str
     image: str = ""  # container image; empty for macOS/Windows (runs natively)
     compiler: str = ""  # compiler name ("gcc" or "clang"); empty for macOS/Windows
-    generator: str = ""  # CMake generator; empty selects Ninja (Linux/macOS)
+    generator: str = "Ninja"  # CMake generator; defaults to Ninja (Linux/macOS)
     compiler_version: str = ""  # Conan MSVC compiler.version; empty auto-detects
 
 
@@ -274,12 +274,16 @@ def expand_platform_matrix(
     When toolsets are defined (Windows), the configs are expanded over the
     cross-product with the toolsets so each config is built against every
     Visual Studio version. Platforms without toolsets (macOS) use a single
-    implicit toolset with no generator override (the build defaults to Ninja).
+    implicit toolset that builds with the Ninja generator.
     """
     platform_name, arch = pf.platform.split("/")
     is_windows = platform_name == "windows"
 
-	toolsets = [t for t in pf.toolsets if not t.exclude] if pf.toolsets else [Toolset(name="", generator="")]
+    toolsets = (
+        [t for t in pf.toolsets if not t.exclude]
+        if pf.toolsets
+        else [Toolset(name="", generator="Ninja")]
+    )
 
     entries: list[MatrixEntry] = []
     for toolset, cfg in itertools.product(toolsets, pf.configs):
diff --git a/.github/workflows/reusable-build-test-config.yml b/.github/workflows/reusable-build-test-config.yml
index 0b87984d14..34ae5717da 100644
--- a/.github/workflows/reusable-build-test-config.yml
+++ b/.github/workflows/reusable-build-test-config.yml
@@ -64,10 +64,9 @@ on:
         default: ""
 
       generator:
-        description: "The CMake generator to use. Leave empty to use Ninja (Linux/macOS)."
-        required: false
+        description: "The CMake generator to use (Linux/macOS use Ninja)."
+        required: true
         type: string
-        default: ""
 
       compiler_version:
         description: "Override the Conan compiler.version (Windows Visual Studio toolset). Leave empty to auto-detect."
@@ -169,7 +168,7 @@ jobs:
         env:
           BUILD_TYPE: ${{ inputs.build_type }}
           CMAKE_ARGS: ${{ inputs.cmake_args }}
-          GENERATOR: ${{ inputs.generator != '' && inputs.generator || 'Ninja' }}
+          GENERATOR: ${{ inputs.generator }}
         run: |
           cmake \
               -G "$GENERATOR" \
diff --git a/.github/workflows/reusable-build-test.yml b/.github/workflows/reusable-build-test.yml
index a29a307e3b..bfc153ae6b 100644
--- a/.github/workflows/reusable-build-test.yml
+++ b/.github/workflows/reusable-build-test.yml
@@ -50,7 +50,7 @@ jobs:
       config_name: ${{ matrix.config_name }}
       sanitizers: ${{ matrix.sanitizers }}
       compiler: ${{ matrix.compiler || '' }}
-      generator: ${{ matrix.generator || '' }}
+      generator: ${{ matrix.generator }}
       compiler_version: ${{ matrix.compiler_version || '' }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}