Skip to content

Commit 79e0c12

Browse files
rsanchez15mergify[bot]
authored andcommitted
Remove deprecated windows-2019 runner (#211)
* Remove deprecated windows-2019 runner Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> * Add vs-toolset matrix Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> --------- Signed-off-by: Raul Sanchez-Mateos <raul@eprosima.com> (cherry picked from commit 653bb92) # Conflicts: # .github/workflows/nightly-windows-ci.yml # .github/workflows/windows-ci.yml
1 parent b72fd9f commit 79e0c12

File tree

3 files changed

+69
-7
lines changed

3 files changed

+69
-7
lines changed
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
name: Shapes Demo Windows CI (nightly)
2+
3+
on:
4+
workflow_dispatch:
5+
schedule:
6+
- cron: '0 1 * * *'
7+
8+
jobs:
9+
nightly-windows-ci-master:
10+
strategy:
11+
fail-fast: false
12+
matrix:
13+
vs-toolset:
14+
- 'v142'
15+
- 'v143'
16+
uses: eProsima/ShapesDemo/.github/workflows/reusable-windows-ci.yml@master
17+
with:
18+
os-version: 'windows-2022'
19+
vs-toolset: ${{ matrix.vs-toolset }}
20+
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-master'
21+
shapes-demo-branch: 'master'
22+
fastdds-branch: 'master'
23+
run-build: true
24+
25+
nightly-windows-ci-3_2_x:
26+
strategy:
27+
fail-fast: false
28+
matrix:
29+
vs-toolset:
30+
- 'v142'
31+
- 'v143'
32+
uses: eProsima/ShapesDemo/.github/workflows/reusable-windows-ci.yml@3.2.x
33+
with:
34+
os-version: 'windows-2022'
35+
vs-toolset: ${{ matrix.vs-toolset }}
36+
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-3.2.x'
37+
shapes-demo-branch: '3.2.x'
38+
fastdds-branch: '3.2.x'
39+
run-build: true
40+
41+
nightly-windows-ci-2_14_x:
42+
strategy:
43+
fail-fast: false
44+
matrix:
45+
vs-toolset:
46+
- 'v142'
47+
- 'v143'
48+
uses: eProsima/ShapesDemo/.github/workflows/reusable-windows-ci.yml@2.14.x
49+
with:
50+
os-version: 'windows-2022'
51+
vs-toolset: ${{ matrix.vs-toolset }}
52+
label: 'nightly-windows-${{ matrix.vs-toolset }}-ci-2.14.x'
53+
shapes-demo-branch: '2.14.x'
54+
fastdds-branch: '2.14.x'
55+
run-build: true

.github/workflows/reusable-windows-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
os-version:
77
description: 'The OS image for the workflow'
88
required: false
9-
default: 'windows-2019'
9+
default: 'windows-2022'
1010
type: string
1111
vs-toolset:
1212
description: 'The VS toolset to use for the build'

.github/workflows/windows-ci.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,7 @@ on:
66
os-version:
77
description: 'OS version to run the workflow'
88
required: false
9-
default: 'windows-2019'
10-
type: string
11-
vs-toolset:
12-
description: 'The VS toolset to use for the build'
13-
required: false
14-
default: 'v142'
9+
default: 'windows-2022'
1510
type: string
1611
colcon-args:
1712
description: 'Extra arguments for colcon cli'
@@ -49,13 +44,25 @@ concurrency:
4944
jobs:
5045
windows-ci:
5146
if: ${{ !(github.event_name == 'pull_request') || !contains(github.event.pull_request.labels.*.name, 'conflicts') }}
47+
strategy:
48+
fail-fast: false
49+
matrix:
50+
vs-toolset:
51+
- 'v142'
52+
- 'v143'
5253
uses: ./.github/workflows/reusable-windows-ci.yml
5354
with:
5455
# It would be desirable to have a matrix of ubuntu OS for this job, but due to the issue opened in this ticket:
5556
# https://github.com/orgs/community/discussions/128118 , it has been set as a single OS job.
57+
<<<<<<< HEAD
5658
os-version: ${{ inputs.os-version || 'windows-2019' }}
5759
vs-toolset: ${{ inputs.vs-toolset || 'v142' }}
5860
label: 'windows-v142-ci-3.2.x'
61+
=======
62+
os-version: ${{ inputs.os-version || 'windows-2022' }}
63+
vs-toolset: ${{ matrix.vs-toolset }}
64+
label: 'windows-v142-ci-master'
65+
>>>>>>> 653bb92 (Remove deprecated windows-2019 runner (#211))
5966
colcon-args: ${{ inputs.colcon-args }}
6067
cmake-args: ${{ inputs.cmake-args }}
6168
ctest-args: ${{ inputs.ctest-args }}

0 commit comments

Comments
 (0)