From 0387755e485f230eef6aaef8e90565106d2b6954 Mon Sep 17 00:00:00 2001 From: Raul Sanchez-Mateos Lizano Date: Fri, 27 Jun 2025 07:40:01 +0200 Subject: [PATCH] Remove deprecated windows-2019 runner (#243) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Remove deprecated windows-2019 runner Signed-off-by: Raul Sanchez-Mateos * Add matrix to windows-ci Signed-off-by: Raul Sanchez-Mateos --------- Signed-off-by: Raul Sanchez-Mateos (cherry picked from commit 19115c526b1a27266b457ac77943790555e6fa6f) Signed-off-by: Ricardo González Moreno --- .github/workflows/reusable-windows-ci.yml | 2 +- .github/workflows/windows-ci.yml | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml index 820ebf58..765ab2c2 100644 --- a/.github/workflows/reusable-windows-ci.yml +++ b/.github/workflows/reusable-windows-ci.yml @@ -6,7 +6,7 @@ on: os-version: description: 'The OS image for the workflow' required: false - default: 'windows-2019' + default: 'windows-2022' type: string vs-toolset: description: 'The VS toolset to use for the build' diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index db164983..206d671d 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -6,12 +6,7 @@ on: os-version: description: 'OS version to run the workflow' required: false - default: 'windows-2019' - type: string - vs-toolset: - description: 'The VS toolset to use for the build' - required: false - default: 'v142' + default: 'windows-2022' type: string colcon-args: description: 'Extra arguments for colcon cli' @@ -53,20 +48,20 @@ concurrency: jobs: windows-ci: + if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }} strategy: fail-fast: false matrix: vs-toolset: - - 'v141' - 'v142' - if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }} + - 'v143' uses: ./.github/workflows/reusable-windows-ci.yml with: # 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 }} - label: 'windows-${{ matrix.vs-toolset }}-ci-1.4.x' + os-version: ${{ inputs.os-version || 'windows-2022' }} + vs-toolset: ${{ matrix.vs-toolset }} + label: '${{ inputs.os-version }}-${{ matrix.vs-toolset }}-ci-${{ inputs.fastdds-python-branch }}-${{ inputs.fastdds-branch }}' colcon-args: ${{ inputs.colcon-args }} cmake-args: ${{ inputs.cmake-args }} ctest-args: ${{ inputs.ctest-args }}