From 77b3da6522f31d65727dd392f73a03ce59f26a3a Mon Sep 17 00:00:00 2001 From: Raul Sanchez-Mateos Date: Wed, 25 Jun 2025 12:09:23 +0200 Subject: [PATCH 1/3] Remove deprecated windows-2019 runner Signed-off-by: Raul Sanchez-Mateos --- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/nightly-windows-ci.yml | 6 +++--- .github/workflows/windows-ci.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index a4e10adc..60831c52 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -36,7 +36,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/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml index 875867fb..9af29e2c 100644 --- a/.github/workflows/nightly-windows-ci.yml +++ b/.github/workflows/nightly-windows-ci.yml @@ -15,7 +15,7 @@ jobs: - 'v142' uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@master with: - os-version: 'windows-2019' + os-version: 'windows-2022' vs-toolset: ${{ matrix.vs-toolset }} label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-master' fastcdr-branch: 'master' @@ -32,7 +32,7 @@ jobs: - 'v142' uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@2.2.x with: - os-version: 'windows-2019' + os-version: 'windows-2022' vs-toolset: ${{ matrix.vs-toolset }} label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-2.2.x' fastcdr-branch: '2.2.x' @@ -49,7 +49,7 @@ jobs: - 'v142' uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@1.0.x with: - os-version: 'windows-2019' + os-version: 'windows-2022' vs-toolset: ${{ matrix.vs-toolset }} label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-1.0.x' fastcdr-branch: '1.0.x' diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index dabd2a11..3fb76fba 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-2019' + default: 'windows-2022' 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-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 2bcb9cd9f1b139c5dd754130a5194b67048a79d3 Mon Sep 17 00:00:00 2001 From: Raul Sanchez-Mateos Date: Wed, 25 Jun 2025 12:35:24 +0200 Subject: [PATCH 2/3] Upgrade Visual Studio toolset from v141 to v143 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 3fb76fba..126e2e1f 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -53,8 +53,8 @@ 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: From 643e1154b88378927bdc4d40def8105b697321fc Mon Sep 17 00:00:00 2001 From: Raul Sanchez-Mateos Date: Thu, 26 Jun 2025 07:06:57 +0200 Subject: [PATCH 3/3] Upgrade missing vs-toolset config Signed-off-by: Raul Sanchez-Mateos --- .github/workflows/nightly-windows-ci.yml | 6 +++--- .github/workflows/windows-ci.yml | 2 +- QUALITY.md | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml index 9af29e2c..5c805615 100644 --- a/.github/workflows/nightly-windows-ci.yml +++ b/.github/workflows/nightly-windows-ci.yml @@ -11,8 +11,8 @@ jobs: fail-fast: false matrix: vs-toolset: - - 'v141' - 'v142' + - 'v143' uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@master with: os-version: 'windows-2022' @@ -28,8 +28,8 @@ jobs: fail-fast: false matrix: vs-toolset: - - 'v141' - 'v142' + - 'v143' uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@2.2.x with: os-version: 'windows-2022' @@ -45,8 +45,8 @@ jobs: fail-fast: false matrix: vs-toolset: - - 'v141' - 'v142' + - 'v143' uses: eProsima/Fast-CDR/.github/workflows/reusable-ci.yml@1.0.x with: os-version: 'windows-2022' diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 126e2e1f..16ad2f65 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -9,7 +9,7 @@ on: default: 'windows-2022' type: string vs-toolset: - description: 'Visual Studio toolset to use (Default: v141 and v142)' + description: 'Visual Studio toolset to use (Default: v142 and v143)' required: false default: '' type: string diff --git a/QUALITY.md b/QUALITY.md index 19ec7db1..4c7de02e 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)