From 9fd40e73a3d7ea9e49b93dbf7a1a8779511b3270 Mon Sep 17 00:00:00 2001 From: Wesley Maxey Date: Wed, 2 Sep 2026 13:15:41 -0700 Subject: [PATCH 1/3] Swap compilers in tag to match linux images --- .github/workflows/build-test-and-push-windows-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test-and-push-windows-image.yml b/.github/workflows/build-test-and-push-windows-image.yml index 368016d38..977aa1509 100644 --- a/.github/workflows/build-test-and-push-windows-image.yml +++ b/.github/workflows/build-test-and-push-windows-image.yml @@ -55,7 +55,7 @@ jobs: cl="$(echo "$INPUT_FEATURES" | jq -r '.[1].version')"; cuda="$(echo "$INPUT_FEATURES" | jq -r '.[0].version')"; version="$(git describe --abbrev=0 --tags --first-parent | sed 's/[a-zA-Z]//g' | cut -d '.' -f -2)"; - base_tag="cuda${cuda}-cl${cl}"; + base_tag="cl${cl}-cuda${cuda}"; tag_without_os="${version}-${base_tag}"; cat < Date: Wed, 2 Sep 2026 13:17:00 -0700 Subject: [PATCH 2/3] Swap compilers in generated image name --- windows/generate-image-name.ps1 | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/windows/generate-image-name.ps1 b/windows/generate-image-name.ps1 index 722d58fcd..5e9b22faa 100644 --- a/windows/generate-image-name.ps1 +++ b/windows/generate-image-name.ps1 @@ -1,20 +1,20 @@ # msvcVersion, cudaVersion, OS edition, isolation mode Param( - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string] $clVersion, - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string] $cudaVersion, - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string] $edition, - [Parameter(Mandatory=$true)] + [Parameter(Mandatory = $true)] [string] $repo, - [Parameter(Mandatory=$false)] + [Parameter(Mandatory = $false)] [string] - $repoVersion="latest" + $repoVersion = "latest" ) -Write-Output "${repo}:${repoVersion}-cuda${cudaVersion}-cl${clVersion}-${edition}" +Write-Output "${repo}:${repoVersion}-cl${clVersion}-cuda${cudaVersion}-${edition}" From 0c69103af084a6e1d2866b691bfe6c06ef4a7152 Mon Sep 17 00:00:00 2001 From: Wesley Maxey Date: Wed, 2 Sep 2026 13:22:30 -0700 Subject: [PATCH 3/3] Update documentation references where the old compiler order was used --- windows/.env | 2 +- windows/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/.env b/windows/.env index 90d148ca4..7a8363c84 100644 --- a/windows/.env +++ b/windows/.env @@ -1,4 +1,4 @@ -IMAGE_NAME=local:cudalatest-cllatest-windows2019 +IMAGE_NAME=local:cllatest-cudalatest-windows2019 ISOLATION=hyperv MSVC_VER=17 MSVC_COMPILER_VER=latest diff --git a/windows/README.md b/windows/README.md index 54fc23fa7..c9ddbe35c 100644 --- a/windows/README.md +++ b/windows/README.md @@ -40,7 +40,7 @@ Build desired configuration. Windows 2019 and Windows 2022 versions map to Windo Start up the container and mount workspace directories as needed. -`$> docker run --mount type=bind,src="$(pwd)",dst="C:\thrust" -it local:windows-cuda-12.1-cl-14.36 powershell` +`$> docker run --mount type=bind,src="$(pwd)",dst="C:\thrust" -it local:latest-cl14.36-cuda12.1-windows2019 powershell` ### Step 3 - Build your projects