Skip to content

Commit cc8f656

Browse files
authored
use self-hosted windows runners (#234)
* use self-hosted windows runner if available * build windows images with docker instead of docker compose * drop windows-2019 from the matrix
1 parent d192e9e commit cc8f656

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

.github/workflows/build-test-and-push-windows-image.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ jobs:
3434
fail-fast: false
3535
matrix:
3636
include:
37-
- { runner: windows-2019, edition: "2019" }
38-
- { runner: windows-2022, edition: "2022" }
37+
- { edition: "2022", runner: "${{ github.repository != 'rapidsai/devcontainers' && 'windows-2022' || 'windows-amd64-cpu4' }}" }
3938
steps:
4039
- name: Checkout ${{ github.repository }}
4140
uses: actions/checkout@v4

windows/build-windows-image.ps1

+1-15
Original file line numberDiff line numberDiff line change
@@ -58,21 +58,7 @@ try {
5858
Write-Output "ENV:CUDA_VER $ENV:CUDA_VER"
5959
Write-Output "ENV:ROOT_IMAGE $ENV:ROOT_IMAGE"
6060

61-
# Docker Desktop includes the compose command while CE installations will only have the standalone plugin.
62-
63-
$compose = "docker compose"
64-
try {
65-
docker compose
66-
TestReturnCode
67-
}
68-
catch {
69-
$compose = "docker-compose.exe"
70-
}
71-
72-
Write-Output "Using $compose for building"
73-
$compose = "$compose -f .\docker-compose.yml build windows"
74-
75-
Invoke-Expression $compose
61+
docker build --file .\windows.Dockerfile --tag "$ENV:IMAGE_NAME" --isolation "$ENV:ISOLATION" --build-arg MSVC_VER="$ENV:MSVC_VER" --build-arg MSVC_COMPILER_VER="$ENV:MSVC_COMPILER_VER" --build-arg CUDA_VER="$ENV:CUDA_VER" --build-arg ROOT_IMAGE="$ENV:ROOT_IMAGE" .\image
7662
}
7763
catch {
7864
Pop-Location

0 commit comments

Comments
 (0)