diff --git a/.github/workflows/reusable-ci.yml b/.github/workflows/reusable-ci.yml index 4b69f6fc..e0ab3b5d 100644 --- a/.github/workflows/reusable-ci.yml +++ b/.github/workflows/reusable-ci.yml @@ -53,6 +53,7 @@ on: type: boolean default: false env: + colcon-build-default-cmake-args: ${{ contains(inputs.os-version, 'windows') && '-DCMAKE_CXX_FLAGS_INIT="/WX"' || '-DCMAKE_CXX_FLAGS_INIT="-Werror"' }} toolset: ${{ inputs.vs-toolset && format('-T {0}', inputs.vs-toolset) || '' }} defaults: run: @@ -122,7 +123,7 @@ jobs: colcon_build_args: ${{ inputs.colcon-args }} colcon_build_args_default: --event-handlers=console_direct+ cmake_args: ${{ inputs.cmake-args }} - cmake_args_default: ${{ env.toolset }} + cmake_args_default: ${{ env.colcon-build-default-cmake-args }} ${{ env.toolset }} cmake_build_type: ${{ matrix.cmake-build-type }} workspace: ${{ github.workspace }}