Skip to content

Update CI from retired Windows 2019 image to Windows 2022 #4262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jul 7, 2025
Merged

Update CI from retired Windows 2019 image to Windows 2022 #4262

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
280ae4b
Initial plan
Copilot Jul 3, 2025
68327c0
Update CI from Windows Server 2019 to Windows latest
Copilot Jul 3, 2025
6bf53cb
Fix Windows ETW native build by updating Visual Studio path for windo…
Copilot Jul 3, 2025
7d2d71a
Fix Visual Studio path detection for windows-latest CI runners
Copilot Jul 3, 2025
cbb8703
Pin Windows runners to windows-2022 (oldest supported version)
Copilot Jul 4, 2025
6d8af0f
Simplify Visual Studio path detection to use standard GitHub Actions …
Copilot Jul 4, 2025
0c14332
Fix Windows CI build by adding proper Visual Studio and Windows SDK s…
Copilot Jul 4, 2025
3f642b3
Remove 3rd party Windows SDK action and use built-in tools
Copilot Jul 4, 2025
c726626
empty commit to reset the last changed by copilot status
trask Jul 7, 2025
1b352bb
another commit to reset the last changed by copilot status
trask Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions .github/workflows/build-common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:

assemble:
# running (and uploading artifact) from windows since only that build includes etw
runs-on: windows-2019
runs-on: windows-latest
steps:
- name: Support long paths
run: git config --system core.longpaths true
Expand All @@ -103,6 +103,9 @@ jobs:
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4

- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v2

- name: Assemble
# javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
run: >
Expand Down Expand Up @@ -131,13 +134,13 @@ jobs:
# TODO (trask) enable once profiler supports OpenJ9
# - openj9
os:
- windows-2019
- windows-latest
- ubuntu-latest
fail-fast: false
steps:
- name: Support long paths
run: git config --system core.longpaths true
if: matrix.os == 'windows-2019'
if: matrix.os == 'windows-latest'

- uses: actions/checkout@v4

Expand Down
2 changes: 1 addition & 1 deletion etw/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The build should find the tools and Windows SDK, but if needed these environment
* Default: `"%ProgramFiles(x86)%/Windows Kits/10"`
* `APPINSIGHTS_VS_PATH`
* Location of Visual Studio Build Tools
* Default: `%ProgramFiles(x86)%/Microsoft Visual Studio 14.0`
* Default: `%ProgramFiles(x86)%/Microsoft Visual Studio/2022/Enterprise`
* `APPINSIGHTS_WIN_SDK_LIB_PATH`
* Location of Windows 10 SDK library folder (for linker requirements)
* Default: `%APPINSIGHTS_WIN10_SDK_PATH%/Lib/10.0.18362.0/um`
Expand Down
24 changes: 23 additions & 1 deletion etw/native/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,29 @@ if (System.env.APPINSIGHTS_WIN10_SDK_PATH) {
winSdkDir = System.env.APPINSIGHTS_WIN10_SDK_PATH
logger.info "Windows SDK path set with environment variable, APPINSIGHTS_WIN10_SDK_PATH"
}
def vsToolsDir = "$programFilesX86/Microsoft Visual Studio 14.0"
// Find Visual Studio installation
def vsToolsDir = "$programFilesX86/Microsoft Visual Studio/2022/Enterprise"

// Check for alternative locations on GitHub Actions
if (!new File(vsToolsDir).exists()) {
def alternativePaths = [
"C:/Program Files/Microsoft Visual Studio/2022/Enterprise",
"$programFilesX86/Microsoft Visual Studio/2022/Professional",
"C:/Program Files/Microsoft Visual Studio/2022/Professional",
"$programFilesX86/Microsoft Visual Studio/2022/Community",
"C:/Program Files/Microsoft Visual Studio/2022/Community",
"$programFilesX86/Microsoft Visual Studio/2022/BuildTools",
"C:/Program Files/Microsoft Visual Studio/2022/BuildTools"
]

for (def path : alternativePaths) {
if (new File(path).exists()) {
vsToolsDir = path
break
}
}
}

if (System.env.APPINSIGHTS_VS_PATH) {
vsToolsDir = System.env.APPINSIGHTS_VS_PATH
logger.info "Visual Studio Build Tools path set with environment variable, APPINSIGHTS_VS_PATH"
Expand Down
Loading