Skip to content

Commit

Permalink
Fix windows default version and remove vs-toolset as input
Browse files Browse the repository at this point in the history
Signed-off-by: Raul Sanchez-Mateos <[email protected]>
  • Loading branch information
rsanchez15 committed Nov 27, 2024
1 parent bfa51aa commit 74c4185
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,7 @@ on:
os-version:
description: 'OS version to run the workflow'
required: false
default: 'windows-13'
type: string
vs-toolset:
description: 'Visual Studio toolset to use'
required: false
default: 'v142'
default: 'windows-2019'
type: string
colcon-args:
description: 'Extra arguments for colcon cli'
Expand Down Expand Up @@ -61,7 +56,7 @@ jobs:
# It would be desirable to have a matrix of windows OS for this job, but due to the issue opened in this ticket:
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
os-version: ${{ inputs.os-version || 'windows-2019' }}
vs-toolset: ${{ inputs.vs-toolset || matrix.vs-toolset }}
vs-toolset: ${{ matrix.vs-toolset }}
label: ${{ format('windows-{0}-ci-{1}', matrix.vs-toolset, inputs.fastcdr-branch || github.ref) }}
colcon-args: ${{ inputs.colcon-args }}
cmake-args: ${{ inputs.cmake-args }}
Expand Down

0 comments on commit 74c4185

Please sign in to comment.