Skip to content

Commit

Permalink
ci: try fix of ICE with VS version
Browse files Browse the repository at this point in the history
  • Loading branch information
luncliff committed Dec 18, 2023
1 parent 83412b1 commit 5702db4
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets
steps:
- uses: actions/[email protected]
- uses: ConorMacBride/install-package@v1
with:
brew: curl bison nasm yasm meson nuget pkg-config
# - uses: ConorMacBride/install-package@v1
# with:
# brew: curl bison nasm yasm meson nuget pkg-config

- uses: actions/[email protected]
with:
Expand All @@ -36,7 +36,7 @@ jobs:
mkdir -p ${VCPKG_DEFAULT_BINARY_CACHE}
- uses: actions/cache@v3
with:
key: "v2349-${{ runner.os }}-${{ matrix.triplet }}"
key: "v2350-${{ runner.os }}-${{ matrix.triplet }}"
path: |
/usr/local/share/vcpkg-downloads
/usr/local/share/vcpkg-archives
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
VCPKG_DEFAULT_BINARY_CACHE: "${{ runner.temp }}/vcpkg-archives"
- uses: actions/cache@v3
with:
key: "v2349-${{ runner.os }}-${{ matrix.triplet }}"
key: "v2350-${{ runner.os }}-${{ matrix.triplet }}"
path: |
${{ runner.temp }}/vcpkg-downloads
${{ runner.temp }}/vcpkg-archives
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,14 @@ jobs:
New-Item -Type Directory -Force ${env:VCPKG_DEFAULT_BINARY_CACHE}
- uses: actions/cache@v3
with:
key: "v2349-${{ runner.os }}-${{ matrix.triplet }}"
key: "v2350-${{ runner.os }}-${{ matrix.triplet }}"
path: |
C:/vcpkg/downloads
C:/vcpkg/archives
- uses: microsoft/[email protected]
- uses: microsoft/setup-msbuild@v1.3.1
with:
msbuild-architecture: x64
vs-version: '[17.8,17.9)'
- uses: lukka/[email protected]
timeout-minutes: 180
with:
Expand All @@ -56,7 +57,7 @@ jobs:
cuda_x64:
runs-on: ["self-hosted", "Windows", "CUDA"]
continue-on-error: true
timeout-minutes: 60
timeout-minutes: 180
env:
VCPKG_DOWNLOADS: "C:/vcpkg/downloads"
VCPKG_DEFAULT_BINARY_CACHE: "C:/vcpkg/archives"
Expand All @@ -69,9 +70,10 @@ jobs:
New-Item -Type Directory -Force ${env:VCPKG_DOWNLOADS}
New-Item -Type Directory -Force ${env:VCPKG_DEFAULT_BINARY_CACHE}
Move-Item -Path "test/self-hosted-cuda.json" -Destination "test/vcpkg.json" -Force
- uses: microsoft/[email protected]
- uses: microsoft/setup-msbuild@v1.3.1
with:
msbuild-architecture: x64
vs-version: '[17.8,17.9)'
- uses: lukka/[email protected]
with:
vcpkgDirectory: "C:/vcpkg"
Expand Down
5 changes: 1 addition & 4 deletions test/self-hosted-cuda.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,7 @@
"platform": "x64 & windows"
},
{
"name": "opencv4",
"features": [
"cudnn"
],
"name": "libtorch",
"platform": "x64 & windows"
}
]
Expand Down

0 comments on commit 5702db4

Please sign in to comment.