diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-08-20 14:23:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-08-20 14:23:12 -0700 |
| commit | 6a562e68a35cdaf9a93d77581475b57d3168ea26 (patch) | |
| tree | 45471328336e53ccb3b354e5675db35d9e082374 | |
| parent | Prepare for 2.46.1 (diff) | |
| parent | ci(win+VS): download the vcpkg artifacts using a dedicated GitHub Action (diff) | |
| download | git-6a562e68a35cdaf9a93d77581475b57d3168ea26.tar.gz git-6a562e68a35cdaf9a93d77581475b57d3168ea26.zip | |
Merge branch 'js/ci-win-vs-build' into maint-2.46
Sync with Windows+VS build jobs used at CI.
* js/ci-win-vs-build:
ci(win+VS): download the vcpkg artifacts using a dedicated GitHub Action
ci: bump microsoft/setup-msbuild from v1 to v2
| -rw-r--r-- | .github/workflows/main.yml | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 13cc0fe807..1ee0433acc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -181,16 +181,12 @@ jobs: repository: 'microsoft/vcpkg' path: 'compat/vcbuild/vcpkg' - name: download vcpkg artifacts - shell: powershell - run: | - $urlbase = "https://dev.azure.com/git/git/_apis/build/builds" - $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=9&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id - $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[0].resource.downloadUrl - (New-Object Net.WebClient).DownloadFile($downloadUrl, "compat.zip") - Expand-Archive compat.zip -DestinationPath . -Force - Remove-Item compat.zip + uses: git-for-windows/get-azure-pipelines-artifact@v0 + with: + repository: git/git + definitionId: 9 - name: add msbuild to PATH - uses: microsoft/setup-msbuild@v1 + uses: microsoft/setup-msbuild@v2 - name: copy dlls to root shell: cmd run: compat\vcbuild\vcpkg_copy_dlls.bat release |