From 62936b86d14de2ac2ddc67a2a740a94f5d37053d Mon Sep 17 00:00:00 2001 From: Raul Sanchez-Mateos Date: Wed, 27 Nov 2024 10:58:12 +0100 Subject: [PATCH 1/4] Fix windows default version and vs-toolset Signed-off-by: Raul Sanchez-Mateos --- .github/workflows/windows-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 761a5430..a12d2828 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -6,12 +6,12 @@ on: os-version: description: 'OS version to run the workflow' required: false - default: 'windows-13' + default: 'windows-2019' type: string vs-toolset: description: 'Visual Studio toolset to use' required: false - default: 'v142' + default: '' type: string colcon-args: description: 'Extra arguments for colcon cli' From 0c21dd4a3508e7a6537c7f1046276f897fefda0f Mon Sep 17 00:00:00 2001 From: Raul Sanchez-Mateos Date: Wed, 27 Nov 2024 11:26:33 +0100 Subject: [PATCH 2/4] Update default windows version and update toolset description Signed-off-by: Raul Sanchez-Mateos --- .github/workflows/windows-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index a12d2828..4ebe56d9 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -6,10 +6,10 @@ on: os-version: description: 'OS version to run the workflow' required: false - default: 'windows-2019' + default: 'windows-2022' type: string vs-toolset: - description: 'Visual Studio toolset to use' + description: 'Visual Studio toolset to use (Default: v141 and v142)' required: false default: '' type: string From 395884c69b703e6af25c392d62c229a433f86ab4 Mon Sep 17 00:00:00 2001 From: Raul Sanchez-Mateos Date: Wed, 27 Nov 2024 11:35:32 +0100 Subject: [PATCH 3/4] Update missing default windows version Signed-off-by: Raul Sanchez-Mateos --- .github/workflows/windows-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 4ebe56d9..3fb76fba 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -60,7 +60,7 @@ jobs: 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' }} + os-version: ${{ inputs.os-version || 'windows-2022' }} vs-toolset: ${{ inputs.vs-toolset || matrix.vs-toolset }} label: ${{ format('windows-{0}-ci-{1}', matrix.vs-toolset, inputs.fastcdr-branch || github.ref) }} colcon-args: ${{ inputs.colcon-args }} From ed122e468f7e3adc0331521117c7f2cdb4df6dd6 Mon Sep 17 00:00:00 2001 From: Raul Sanchez-Mateos Date: Wed, 27 Nov 2024 11:56:28 +0100 Subject: [PATCH 4/4] Set windows version back to 2019 Signed-off-by: Raul Sanchez-Mateos --- .github/workflows/windows-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 3fb76fba..dabd2a11 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -6,7 +6,7 @@ on: os-version: description: 'OS version to run the workflow' required: false - default: 'windows-2022' + default: 'windows-2019' type: string vs-toolset: description: 'Visual Studio toolset to use (Default: v141 and v142)' @@ -60,7 +60,7 @@ jobs: 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-2022' }} + os-version: ${{ inputs.os-version || 'windows-2019' }} vs-toolset: ${{ inputs.vs-toolset || matrix.vs-toolset }} label: ${{ format('windows-{0}-ci-{1}', matrix.vs-toolset, inputs.fastcdr-branch || github.ref) }} colcon-args: ${{ inputs.colcon-args }}