Skip to content

Commit 95d9ea4

Browse files
microzchangazure-sdkpraveenkuttappandanieljurekweshaggard
committed
Storage/ Merge main to unblock pipeline failure (Azure#5561)
* Sync eng/common directory with azure-sdk-tools for PR 8110 (Azure#5540) * Show review link in logs and set DevOps project name based on the pipeline run * Handle the failures when package work item is unassigned (Azure#5551) Co-authored-by: Praveen Kuttappan <prmarott@microsoft.com> * Revert win2022 image back to latest and add msvc version mitigation (Azure#5539) * Revert win2022 image back to latest * Workaround fix for MSVC SxS issue * Fix Policheck step indention (Azure#5553) Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com> * Sync .github/workflows directory with azure-sdk-tools for PR 8131 (Azure#5555) * Update to azure/login@v2 * Remove the unnecessary setting of enable-AzPSSession. We don't need it. --------- Co-authored-by: James Suplizio <jasupliz@microsoft.com> * Update sorting algorithm used in storage shared-key signing (Azure#5547) * Remove Windows upgrade of cmake (windows image now uses working version of cmake) (Azure#5558) * Revert "Update sorting algorithm used in storage shared-key signing (Azure#5547)" (Azure#5560) This reverts commit b6e04fd. --------- Co-authored-by: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Co-authored-by: Praveen Kuttappan <prmarott@microsoft.com> Co-authored-by: Daniel Jurek <djurek@microsoft.com> Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com> Co-authored-by: James Suplizio <jasupliz@microsoft.com> Co-authored-by: JinmingHu <jinmhu@microsoft.com>
1 parent be8f2f4 commit 95d9ea4

2 files changed

Lines changed: 25 additions & 0 deletions

File tree

eng/pipelines/templates/jobs/archetype-sdk-client.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,10 @@ jobs:
200200
workingDirectory: $(Agent.TempDirectory)
201201
displayName: Download and Install Doxygen
202202
203+
- template: /eng/pipelines/templates/steps/install-cmake.yml
204+
205+
- template: /eng/pipelines/templates/steps/setup-msvc.yml
206+
203207
- template: /eng/pipelines/templates/steps/vcpkg.yml
204208

205209
- template: /eng/pipelines/templates/steps/cmake-build.yml
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# This temporary fix resolves an issue on Win2022 machines that have multiple
2+
# MSVC versions installed side-by-side. When this issue is resolved, remove this
3+
# template and references:
4+
# https://github.com/actions/runner-images/issues/9701
5+
6+
steps:
7+
- pwsh: |
8+
$tempFile = New-TemporaryFile;
9+
systeminfo.exe /fo csv > $tempFile
10+
$osName = (Import-Csv $tempFile).'OS Name'
11+
12+
Write-Host "OS Name: $osName"
13+
if (!($osName -like '*2022*')) {
14+
Write-Host "OS is not Windows Server 2022, skipping MSVC changes"
15+
exit 0
16+
}
17+
18+
Remove-item 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\Microsoft.VCToolsVersion.v143.default.*' -Force
19+
Get-ChildItem 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\' -Name | Write-Host
20+
displayName: Setup MSVC
21+
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))

0 commit comments

Comments
 (0)