Skip to content

Commit

Permalink
ci: misc updates for 1.2407.x
Browse files Browse the repository at this point in the history
  • Loading branch information
luncliff committed Feb 12, 2024
1 parent 0832961 commit d176885
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 14 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ jobs:
mkdir -p ${VCPKG_DOWNLOADS}
mkdir -p ${VCPKG_DEFAULT_BINARY_CACHE}
- uses: actions/cache@v3.3.2
- uses: actions/cache@v4.0.0
with:
key: "v2404-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
key: "v2407-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
path: |
/usr/local/share/vcpkg-downloads
/usr/local/share/vcpkg-archives
- uses: lukka/run-vcpkg@v11.3
- uses: lukka/run-vcpkg@v11.5
with:
vcpkgDirectory: "/usr/local/share/vcpkg" # see VCPKG_INSTALLATION_ROOT
vcpkgGitCommitId: "${{ matrix.vcpkg_commit }}"
Expand All @@ -48,7 +48,7 @@ jobs:
VCPKG_DEFAULT_TRIPLET: "x64-osx"
VCPKG_BINARY_SOURCES: "default"

- uses: lukka/run-vcpkg@v11.3
- uses: lukka/run-vcpkg@v11.5
with:
vcpkgDirectory: "/usr/local/share/vcpkg" # see VCPKG_INSTALLATION_ROOT
vcpkgGitCommitId: "${{ matrix.vcpkg_commit }}"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ jobs:
VCPKG_DOWNLOADS: "${{ runner.temp }}/vcpkg-downloads"
VCPKG_DEFAULT_BINARY_CACHE: "${{ runner.temp }}/vcpkg-archives"

- uses: actions/cache@v3.3.2
- uses: actions/cache@v4.0.0
with:
key: "v2404-x64-linux-${{ matrix.vcpkg_tag }}"
key: "v2407-x64-linux-${{ matrix.vcpkg_tag }}"
path: |
${{ runner.temp }}/vcpkg-downloads
${{ runner.temp }}/vcpkg-archives
- uses: lukka/run-vcpkg@v11.3
- uses: lukka/run-vcpkg@v11.5
with:
vcpkgDirectory: "/usr/local/share/vcpkg" # see VCPKG_INSTALLATION_ROOT
doNotUpdateVcpkg: true
doNotUpdateVcpkg: true # no permission
vcpkgGitCommitId: "${{ matrix.vcpkg_commit }}"
vcpkgJsonGlob: "test/vcpkg.json"
runVcpkgInstall: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-windows-cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/triplets"
steps:
- uses: actions/[email protected]
- uses: microsoft/setup-msbuild@v1.3.1
- uses: microsoft/setup-msbuild@v2
with:
msbuild-architecture: x64

Expand All @@ -27,7 +27,7 @@ jobs:
New-Item -Type Directory -Force ${env:VCPKG_DEFAULT_BINARY_CACHE}
Move-Item -Path "test/self-hosted-cuda.json" -Destination "test/vcpkg.json" -Force
- uses: lukka/run-vcpkg@v11.3
- uses: lukka/run-vcpkg@v11.5
with:
vcpkgDirectory: "C:/vcpkg"
vcpkgGitCommitId: "c8696863d371ab7f46e213d8f5ca923c4aef2a00" # 2023.12.12
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/triplets"
steps:
- uses: actions/[email protected]
- uses: microsoft/setup-msbuild@v1.3.1
- uses: microsoft/setup-msbuild@v2
with:
msbuild-architecture: x64

Expand All @@ -34,14 +34,14 @@ jobs:
New-Item -Type Directory -Force ${env:VCPKG_DOWNLOADS}
New-Item -Type Directory -Force ${env:VCPKG_DEFAULT_BINARY_CACHE}
- uses: actions/cache@v3.3.2
- uses: actions/cache@v4.0.0
with:
key: "v2404-x64-windows-${{ matrix.vcpkg_tag }}"
key: "v2407-x64-windows-${{ matrix.vcpkg_tag }}"
path: |
C:/vcpkg/downloads
C:/vcpkg/archives
- uses: lukka/run-vcpkg@v11.3
- uses: lukka/run-vcpkg@v11.5
with:
vcpkgDirectory: "C:/vcpkg"
vcpkgGitCommitId: "${{ matrix.vcpkg_commit }}"
Expand Down
1 change: 1 addition & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,7 @@ stages:
displayName: "Test: osx(host)"
inputs:
script: |
New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
$Ports=$(Get-Content "test/azure-port-osx-host.txt")
vcpkg install $Ports --clean-buildtrees-after-build --clean-packages-after-build
targetType: 'inline'
Expand Down

0 comments on commit d176885

Please sign in to comment.