From a84edaa4a498b5206813e471f208d35cf7564b50 Mon Sep 17 00:00:00 2001 From: Antonio Maiorano Date: Mon, 7 Jun 2021 19:46:54 +0000 Subject: [PATCH] Kokoro-Windows: use latest DXC artifact Rather than use the latest release, use the latest AppVeyor build artifact (see https://github.com/microsoft/DirectXShaderCompiler#downloads) Latest release doesn't support tint's generated HLSL. Bug: tint:872 Change-Id: Icfe5cc20647775cfae032407ae3e298c5519fbe1 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/53602 Reviewed-by: Ben Clayton Kokoro: Kokoro Commit-Queue: Antonio Maiorano --- kokoro/windows/build.bat | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kokoro/windows/build.bat b/kokoro/windows/build.bat index e4fe0eb47e..0d6628766b 100644 --- a/kokoro/windows/build.bat +++ b/kokoro/windows/build.bat @@ -62,13 +62,14 @@ mkdir %TEMP_DIR% || goto :error call :status "Fetching DXC" @echo on -curl -L https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.5.2010/dxc_2020_10-22.zip --output %TEMP_DIR%\dxc.zip || goto :error +set DXC_LATEST_ARTIFACT="https://ci.appveyor.com/api/projects/dnovillo/directxshadercompiler/artifacts/build%%2FRelease%%2Fdxc-artifacts.zip?branch=master&pr=false&job=image%%3A%%20Visual%%20Studio%%202019" +curl -L %DXC_LATEST_ARTIFACT% --output "%TEMP_DIR%\dxc.zip" || goto :error @echo off call :status "Unpacking DXC" @echo on powershell.exe -Command "Expand-Archive -LiteralPath '%TEMP_DIR%\dxc.zip' -DestinationPath '%TEMP_DIR%\dxc'" || goto :error -set PATH=%TEMP_DIR%\dxc\bin\x64;%PATH% +set PATH=%TEMP_DIR%\dxc\bin;%PATH% @echo off call :status "Installing depot_tools"