diff --git a/.github/workflows/nightly-windows-ci.yml b/.github/workflows/nightly-windows-ci.yml index ccff6975..1a1dc87e 100644 --- a/.github/workflows/nightly-windows-ci.yml +++ b/.github/workflows/nightly-windows-ci.yml @@ -8,11 +8,17 @@ on: jobs: # python main - fastdds master nightly-windows-ci-main: + strategy: + fail-fast: false + matrix: + vs-toolset: + - 'v142' + - 'v143' uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@main with: - os-version: 'windows-2019' - vs-toolset: 'v142' - label: 'nightly-windows-v142-ci-main-master' + os-version: 'windows-2022' + vs-toolset: ${{ matrix.vs-toolset }} + label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-main-master' fastdds-python-branch: 'main' fastdds-branch: 'master' run-build: true @@ -20,11 +26,17 @@ jobs: # python 2.2.x - fastdds 3.2.x nightly-windows-ci-2_2_x: + strategy: + fail-fast: false + matrix: + vs-toolset: + - 'v142' + - 'v143' uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@2.2.x with: - os-version: 'windows-2019' - vs-toolset: 'v142' - label: 'nightly-windows-v142-ci-2.2.x-3.2.x' + os-version: 'windows-2022' + vs-toolset: ${{ matrix.vs-toolset }} + label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-2.2.x-3.2.x' fastdds-python-branch: '2.2.x' fastdds-branch: '3.2.x' run-build: true @@ -36,11 +48,10 @@ jobs: fail-fast: false matrix: vs-toolset: - - 'v141' - 'v142' uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@1.4.x with: - os-version: 'windows-2019' + os-version: 'windows-2022' vs-toolset: ${{ matrix.vs-toolset }} label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-1.4.x-2.14.x' fastdds-python-branch: '1.4.x' diff --git a/.github/workflows/reusable-windows-ci.yml b/.github/workflows/reusable-windows-ci.yml index a862c12f..8561f041 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/weekly-windows-ci.yml b/.github/workflows/weekly-windows-ci.yml index 1ba2aa8c..8f5d5d51 100644 --- a/.github/workflows/weekly-windows-ci.yml +++ b/.github/workflows/weekly-windows-ci.yml @@ -11,11 +11,10 @@ jobs: fail-fast: false matrix: vs-toolset: - - 'v141' - 'v142' uses: eProsima/Fast-DDS-Python/.github/workflows/reusable-windows-ci.yml@1.0.x with: - os-version: 'windows-2019' + os-version: 'windows-2022' vs-toolset: ${{ matrix.vs-toolset }} label: 'weekly-windows-${{ matrix.vs-toolset }}-ci-1.0.x-2.6.x' fastdds-python-branch: '1.0.x' diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index d933cca5..820670a0 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' @@ -54,13 +49,19 @@ 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: + - 'v142' + - '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 || 'v142' }} - label: '${{ inputs.os-version }}-${{ inputs.vs-toolset }}-ci-${{ inputs.fastdds-python-branch }}-${{ inputs.fastdds-branch }}' + 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 }}