Update ci pipeline to allow switching between msvc versions

This commit is contained in:
JCW
2026-06-11 13:29:53 +01:00
parent 09c36d066e
commit 69aadde85c
6 changed files with 71 additions and 4 deletions

View File

@@ -63,6 +63,18 @@ on:
type: string
default: ""
generator:
description: "The CMake generator to use. Leave empty to use Ninja (Linux/macOS)."
required: false
type: string
default: ""
compiler_version:
description: "Override the Conan compiler.version (Windows Visual Studio toolset). Leave empty to auto-detect."
required: false
type: string
default: ""
secrets:
CODECOV_TOKEN:
description: "The Codecov token to use for uploading coverage reports."
@@ -150,6 +162,7 @@ jobs:
# amount of logs. For other OSes, the "verbose" logs are more useful.
log_verbosity: ${{ runner.os == 'Windows' && 'quiet' || 'verbose' }}
sanitizers: ${{ inputs.sanitizers }}
compiler_version: ${{ inputs.compiler_version }}
- name: Configure CMake
working-directory: ${{ env.BUILD_DIR }}
@@ -158,7 +171,7 @@ jobs:
CMAKE_ARGS: ${{ inputs.cmake_args }}
run: |
cmake \
-G '${{ runner.os == 'Windows' && 'Visual Studio 17 2022' || 'Ninja' }}' \
-G '${{ inputs.generator != '' && inputs.generator || 'Ninja' }}' \
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=build/generators/conan_toolchain.cmake \
-DCMAKE_BUILD_TYPE="${BUILD_TYPE}" \
${CMAKE_ARGS} \

View File

@@ -50,5 +50,7 @@ jobs:
config_name: ${{ matrix.config_name }}
sanitizers: ${{ matrix.sanitizers }}
compiler: ${{ matrix.compiler || '' }}
generator: ${{ matrix.generator || '' }}
compiler_version: ${{ matrix.compiler_version || '' }}
secrets:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

View File

@@ -105,6 +105,7 @@ jobs:
# amount of logs. For other OSes, the "verbose" logs are more useful.
log_verbosity: ${{ runner.os == 'Windows' && 'quiet' || 'verbose' }}
sanitizers: ${{ matrix.sanitizers }}
compiler_version: ${{ matrix.compiler_version || '' }}
- name: Log into Conan remote
if: ${{ github.repository == 'XRPLF/rippled' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') }}