Skip to content

Commit 8051933

Browse files
Use windows-2022 instead of -2019 due to deprecation and switch to VS 2022 (#999)
Signed-off-by: Christophe Bedard <bedard.christophe@gmail.com>
1 parent eed42df commit 8051933

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

.github/workflows/test.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ jobs:
6868
matrix:
6969
os:
7070
# - macOS-latest
71-
- windows-2019
71+
- windows-2022
7272
ros_distribution: [humble, jazzy, kilted]
7373
env:
74-
INSTALL_TYPE: ${{ matrix.os == 'windows-2019' && 'merged' || 'default' }}
75-
INSTALL_PATH: ${{ matrix.os == 'windows-2019' && 'install/share' || 'install' }}
74+
INSTALL_TYPE: ${{ startsWith(matrix.os, 'windows') && 'merged' || 'default' }}
75+
INSTALL_PATH: ${{ startsWith(matrix.os, 'windows') && 'install/share' || 'install' }}
7676
steps:
7777
- uses: actions/checkout@v4
7878
- uses: actions/setup-node@v4.4.0
@@ -233,13 +233,13 @@ jobs:
233233
ros_distribution: kilted
234234
- os: ubuntu:24.04
235235
ros_distribution: rolling
236-
- os: windows-2019
236+
- os: windows-2022
237237
ros_distribution: humble
238-
- os: windows-2019
238+
- os: windows-2022
239239
ros_distribution: jazzy
240-
- os: windows-2019
240+
- os: windows-2022
241241
ros_distribution: kilted
242-
- os: windows-2019
242+
- os: windows-2022
243243
ros_distribution: rolling
244244
# - os: macOS-latest
245245
# ros_distribution: humble
@@ -251,8 +251,8 @@ jobs:
251251
# ros_distribution: rolling
252252
env:
253253
DISTRO_REPOS_URL: "https://raw.githubusercontent.com/ros2/ros2/${{ matrix.ros_distribution }}/ros2.repos"
254-
INSTALL_TYPE: ${{ matrix.os == 'windows-2019' && 'merged' || 'default' }}
255-
INSTALL_PATH: ${{ matrix.os == 'windows-2019' && 'install/share' || 'install' }}
254+
INSTALL_TYPE: ${{ startsWith(matrix.os, 'windows') && 'merged' || 'default' }}
255+
INSTALL_PATH: ${{ startsWith(matrix.os, 'windows') && 'install/share' || 'install' }}
256256
steps:
257257
- uses: actions/checkout@v4
258258
- uses: actions/setup-node@v4.4.0

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ For reference, these are the minimum tools needed by the action, which are provi
4444
- `colcon-coveragepy-result` (Optional)
4545
- `colcon-mixin` (Optional)
4646

47-
**Note**: for Windows, `action-ros-ci` currently needs to be run on `windows-2019` or needs another action to install Visual Studio 2019.
47+
**Note**: for Windows, ROS 2 currently only officially supports Visual Studio 2019, but GitHub has dropped support for the `windows-2019` runner image, so we can only use `windows-2022` (Visual Studio 2022) or newer.
4848

4949
## Overview
5050

dist/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30803,7 +30803,7 @@ function execShellCommand(command_1, options_1) {
3080330803
"/S",
3080430804
"/C",
3080530805
"call",
30806-
"%programfiles(x86)%\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat",
30806+
"%programfiles%\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat",
3080730807
"&&",
3080830808
...(use_bash ? [`C:\\Program Files\\Git\\bin\\bash.exe`, `-c`] : []),
3080930809
...command,

src/action-ros-ci.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ export async function execShellCommand(
107107
"/S",
108108
"/C",
109109
"call",
110-
"%programfiles(x86)%\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat",
110+
"%programfiles%\\Microsoft Visual Studio\\2022\\Enterprise\\VC\\Auxiliary\\Build\\vcvars64.bat",
111111
"&&",
112112
...(use_bash ? [`C:\\Program Files\\Git\\bin\\bash.exe`, `-c`] : []),
113113
...command,

0 commit comments

Comments
 (0)