Skip to content

Commit

Permalink
Storage/ Merge main to unblock pipeline failure (Azure#5561)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
7 people committed May 27, 2024
1 parent be8f2f4 commit 95d9ea4
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
4 changes: 4 additions & 0 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,10 @@ jobs:
workingDirectory: $(Agent.TempDirectory)
displayName: Download and Install Doxygen
- template: /eng/pipelines/templates/steps/install-cmake.yml

- template: /eng/pipelines/templates/steps/setup-msvc.yml

- template: /eng/pipelines/templates/steps/vcpkg.yml

- template: /eng/pipelines/templates/steps/cmake-build.yml
Expand Down
21 changes: 21 additions & 0 deletions eng/pipelines/templates/steps/setup-msvc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# This temporary fix resolves an issue on Win2022 machines that have multiple
# MSVC versions installed side-by-side. When this issue is resolved, remove this
# template and references:
# https://github.com/actions/runner-images/issues/9701

steps:
- pwsh: |
$tempFile = New-TemporaryFile;
systeminfo.exe /fo csv > $tempFile
$osName = (Import-Csv $tempFile).'OS Name'
Write-Host "OS Name: $osName"
if (!($osName -like '*2022*')) {
Write-Host "OS is not Windows Server 2022, skipping MSVC changes"
exit 0
}
Remove-item 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\Microsoft.VCToolsVersion.v143.default.*' -Force
Get-ChildItem 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\' -Name | Write-Host
displayName: Setup MSVC
condition: and(succeeded(), eq(variables['Agent.OS'], 'Windows_NT'))

0 comments on commit 95d9ea4

Please sign in to comment.