From 5a6a1190928d539f7e269270f4152d1806976383 Mon Sep 17 00:00:00 2001 From: Raul Sanchez-Mateos Lizano Date: Thu, 26 Jun 2025 11:10:09 +0200 Subject: [PATCH 1/2] Remove deprecated windows-2019 runner (#270) * Remove deprecated windows-2019 runner Signed-off-by: Raul Sanchez-Mateos * Upgrade Visual Studio toolset from v141 to v143 Signed-off-by: Raul Sanchez-Mateos * Upgrade missing vs-toolset config Signed-off-by: Raul Sanchez-Mateos --------- Signed-off-by: Raul Sanchez-Mateos (cherry picked from commit eac23fb221f21b154e52331a060c84eb7615a5db) --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/windows-ci.yml | 10 +++++----- QUALITY.md | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index da727c1a..14820bdb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2019, ubuntu-22.04, macos-13, ] + os: [windows-2022, ubuntu-22.04, macos-13, ] language: [ 'cpp' ] # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] # Learn more: diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 761a5430..16ad2f65 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-2022' type: string vs-toolset: - description: 'Visual Studio toolset to use' + description: 'Visual Studio toolset to use (Default: v142 and v143)' required: false - default: 'v142' + default: '' type: string colcon-args: description: 'Extra arguments for colcon cli' @@ -53,14 +53,14 @@ jobs: fail-fast: false matrix: vs-toolset: - - 'v141' - 'v142' + - 'v143' if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }} uses: ./.github/workflows/reusable-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' }} + 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 }} diff --git a/QUALITY.md b/QUALITY.md index ed4f2312..c2d3d86a 100644 --- a/QUALITY.md +++ b/QUALITY.md @@ -63,7 +63,7 @@ Current nightly results can be seen here for all supported platforms: * Linux [![Linux ci](http://jenkins.eprosima.com:8080/view/Nightly/job/nightly_fastcdr_master_linux/badge/icon?subject=%20%20%20Linux%20CI%20)](http://jenkins.eprosima.com:8080/view/Nightly/job/nightly_fastcdr_master_linux/) * Linux-aarch64 [![Linux arm64 ci](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_linux_aarch64/badge/icon?subject=%20%20%20Linux-aarch64%20CI%20)](http://jenkins.eprosima.com:8080/view/Nightly/job/nightly_fastcdr_master_linux_aarch64/) -* Windows [![Windows ci](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_windows/label=windows-secure,platform=x64,toolset=v141/badge/icon?subject=%20%20%20%20Windows%20CI%20)](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_windows/label=windows-secure,platform=x64,toolset=v141) +* Windows [![Windows ci](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_windows/label=windows-secure,platform=x64,toolset=v142/badge/icon?subject=%20%20%20%20Windows%20CI%20)](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_windows/label=windows-secure,platform=x64,toolset=v142) * Mac [![Mac ci](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_mac/badge/icon?subject=%20%20%20%20%20%20%20Mac%20CI%20)](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_mac) ### Documentation Policy [2.v] @@ -102,7 +102,7 @@ Current nightly results can be found here: * Linux [![Linux ci](http://jenkins.eprosima.com:8080/view/Nightly/job/nightly_fastcdr_master_linux/badge/icon?subject=%20%20%20Linux%20CI%20)](http://jenkins.eprosima.com:8080/view/Nightly/job/nightly_fastcdr_master_linux/) * Linux-aarch64 [![Linux arm64 ci](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_linux_aarch64/badge/icon?subject=%20%20%20Linux-aarch64%20CI%20)](http://jenkins.eprosima.com:8080/view/Nightly/job/nightly_fastcdr_master_linux_aarch64/) -* Windows [![Windows ci](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_windows/label=windows-secure,platform=x64,toolset=v141/badge/icon?subject=%20%20%20%20Windows%20CI%20)](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_windows/label=windows-secure,platform=x64,toolset=v141) +* Windows [![Windows ci](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_windows/label=windows-secure,platform=x64,toolset=v142/badge/icon?subject=%20%20%20%20Windows%20CI%20)](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_windows/label=windows-secure,platform=x64,toolset=v142) * Mac [![Mac ci](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_mac/badge/icon?subject=%20%20%20%20%20%20%20Mac%20CI%20)](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_mac) ### Public API Testing [4.ii] @@ -155,7 +155,7 @@ However, the tendency will be to homogenize the older source files to the code s * Linux [![Linux ci](http://jenkins.eprosima.com:8080/view/Nightly/job/nightly_fastcdr_master_linux/badge/icon?subject=%20%20%20Linux%20CI%20)](http://jenkins.eprosima.com:8080/view/Nightly/job/nightly_fastcdr_master_linux/) * Linux-aarch64 [![Linux arm64 ci](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_linux_aarch64/badge/icon?subject=%20%20%20Linux-aarch64%20CI%20)](http://jenkins.eprosima.com:8080/view/Nightly/job/nightly_fastcdr_master_linux_aarch64/) -* Windows [![Windows ci](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_windows/label=windows-secure,platform=x64,toolset=v141/badge/icon?subject=%20%20%20%20Windows%20CI%20)](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_windows/label=windows-secure,platform=x64,toolset=v141) +* Windows [![Windows ci](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_windows/label=windows-secure,platform=x64,toolset=v142/badge/icon?subject=%20%20%20%20Windows%20CI%20)](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_windows/label=windows-secure,platform=x64,toolset=v142) * Mac [![Mac ci](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_mac/badge/icon?subject=%20%20%20%20%20%20%20Mac%20CI%20)](http://jenkins.eprosima.com:8080/job/nightly_fastcdr_master_mac) More information about the supported platforms can be found in [PLATFORM_SUPPORT](PLATFORM_SUPPORT.md) From 584ac78f6be98416208960a9a43ab8169d4a517b Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Fri, 31 Oct 2025 10:52:15 +0100 Subject: [PATCH 2/2] Use ubuntu 22 in CI runner Signed-off-by: Miguel Company --- .github/workflows/ubuntu-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml index 0c0eb865..a5ee4116 100644 --- a/.github/workflows/ubuntu-ci.yml +++ b/.github/workflows/ubuntu-ci.yml @@ -6,7 +6,7 @@ on: os-version: description: 'OS version to run the workflow' required: false - default: 'ubuntu-20.04' + default: 'ubuntu-22.04' type: string colcon-args: description: 'Extra arguments for colcon cli' @@ -54,7 +54,7 @@ jobs: with: # It would be desirable to have a matrix of ubuntu 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 || 'ubuntu-20.04' }} + os-version: ${{ inputs.os-version || 'ubuntu-22.04' }} label: ${{ format('ubuntu-ci-{0}', inputs.fastcdr-branch || github.ref) }} colcon-args: ${{ inputs.colcon-args }} cmake-args: ${{ inputs.cmake-args }}