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 1 commit
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
13 changes: 13 additions & 0 deletions .github/workflows/build-common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,19 @@ jobs:
- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v2

- name: Setup Windows 10 SDK
uses: GuillaumeFalourd/setup-windows10-sdk-action@v2
with:
sdk-version: 22621

- name: Setup Visual Studio environment
shell: cmd
run: |
"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath > vs.txt
set /p VSPATH=<vs.txt
echo APPINSIGHTS_VS_PATH=%VSPATH%>>%GITHUB_ENV%
echo APPINSIGHTS_WIN10_SDK_PATH=C:\Program Files (x86)\Windows Kits\10>>%GITHUB_ENV%

- name: Assemble
# javadoc task fails sporadically fetching https://docs.oracle.com/javase/8/docs/api/
run: >
Expand Down
10 changes: 5 additions & 5 deletions etw/native/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ 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"
}
// Visual Studio 2022 Build Tools path for GitHub Actions windows-2022 runners
def vsToolsDir = "$programFilesX86/Microsoft Visual Studio/2022/BuildTools"

// Visual Studio Build Tools path - use environment variable if available, fallback to standard path
def vsToolsDir = System.env.APPINSIGHTS_VS_PATH ?: "$programFilesX86/Microsoft Visual Studio/2022/BuildTools"
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"
logger.info "Visual Studio Build Tools path set with environment variable: $vsToolsDir"
} else {
logger.info "Using default Visual Studio Build Tools path: $vsToolsDir"
}

logger.info "Windows SDK: $winSdkDir"
Expand Down