authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-12-07 02:47:54-08:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-12-07 12:49:17-07:00
log1122d9d212f2147e12675eb86565d63d2b0949a5
tree46a09b0f4637700dc98df522ebacded0180e1dae
parent6d48357cc79a8c6b626cba7152165dfe2d3674d3

CI: windows: fix zig lib dir path

See #12685

1 files changed, 6 insertions(+), 5 deletions(-)

ci/x86_64-windows.ps1+6-5
...@@ -4,6 +4,7 @@ $MCPU = "baseline"...@@ -4,6 +4,7 @@ $MCPU = "baseline"
4$ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"4$ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip"
5$PREFIX_PATH = "$(Get-Location)\$ZIG_LLVM_CLANG_LLD_NAME"5$PREFIX_PATH = "$(Get-Location)\$ZIG_LLVM_CLANG_LLD_NAME"
6$ZIG = "$PREFIX_PATH\bin\zig.exe"6$ZIG = "$PREFIX_PATH\bin\zig.exe"
7$ZIG_LIB_DIR = "$(Get-Location)\lib"
78
8Write-Output "Downloading $ZIG_LLVM_CLANG_LLD_URL"9Write-Output "Downloading $ZIG_LLVM_CLANG_LLD_URL"
9Invoke-WebRequest -Uri "$ZIG_LLVM_CLANG_LLD_URL" -OutFile "$ZIG_LLVM_CLANG_LLD_NAME.zip"10Invoke-WebRequest -Uri "$ZIG_LLVM_CLANG_LLD_URL" -OutFile "$ZIG_LLVM_CLANG_LLD_NAME.zip"
...@@ -52,8 +53,8 @@ CheckLastExitCode...@@ -52,8 +53,8 @@ CheckLastExitCode
5253
53Write-Output "Main test suite..."54Write-Output "Main test suite..."
54& "stage3-release\bin\zig.exe" build test docs `55& "stage3-release\bin\zig.exe" build test docs `
55 --zig-lib-dir "..\lib" `56 --zig-lib-dir "$ZIG_LIB_DIR" `
56 --search-prefix "../$ZIG_LLVM_CLANG_LLD_NAME" `57 --search-prefix "$PREFIX_PATH" `
57 -Dstatic-llvm `58 -Dstatic-llvm `
58 -Dskip-non-native `59 -Dskip-non-native `
59 -Denable-symlinks-windows60 -Denable-symlinks-windows
...@@ -61,8 +62,8 @@ CheckLastExitCode...@@ -61,8 +62,8 @@ CheckLastExitCode
6162
62Write-Output "Testing Autodocs..."63Write-Output "Testing Autodocs..."
63& "stage3-release\bin\zig.exe" test "..\lib\std\std.zig" `64& "stage3-release\bin\zig.exe" test "..\lib\std\std.zig" `
64 --zig-lib-dir "..\lib" `65 --zig-lib-dir "$ZIG_LIB_DIR" `
65 -femit-docs `66 -femit-docs `
66 -fno-emit-bin67 -fno-emit-bin
67CheckLastExitCode68CheckLastExitCode
6869