From c71943f1253a2e4f82fae84d319b8e682afa7061 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 29 Apr 2024 16:08:50 -0700 Subject: [PATCH] CI: fix windows paths for fetching tarball --- ci/aarch64-windows.ps1 | 6 +++--- ci/x86_64-windows-debug.ps1 | 6 +++--- ci/x86_64-windows-release.ps1 | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci/aarch64-windows.ps1 b/ci/aarch64-windows.ps1 index 20bf1b5588a576fe4267919af15c66573b97b960..7a45b96b37ba5d6c6f1e27f6ccf9ebe298a2e0b8 100644 --- a/ci/aarch64-windows.ps1 +++ b/ci/aarch64-windows.ps1 @@ -6,13 +6,13 @@ $PREFIX_PATH = "$($Env:USERPROFILE)\$ZIG_LLVM_CLANG_LLD_NAME" $ZIG = "$PREFIX_PATH\bin\zig.exe" $ZIG_LIB_DIR = "$(Get-Location)\lib" -if (!(Test-Path "..\$ZIG_LLVM_CLANG_LLD_NAME.zip")) { +if (!(Test-Path "$PREFIX_PATH.zip")) { Write-Output "Downloading $ZIG_LLVM_CLANG_LLD_URL" - Invoke-WebRequest -Uri "$ZIG_LLVM_CLANG_LLD_URL" -OutFile "..\$ZIG_LLVM_CLANG_LLD_NAME.zip" + Invoke-WebRequest -Uri "$ZIG_LLVM_CLANG_LLD_URL" -OutFile "$PREFIX_PATH.zip" Write-Output "Extracting..." Add-Type -AssemblyName System.IO.Compression.FileSystem ; - [System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD\..\$ZIG_LLVM_CLANG_LLD_NAME.zip", "$PWD\..") + [System.IO.Compression.ZipFile]::ExtractToDirectory("$PREFIX_PATH.zip", "$PREFIX_PATH\..") } function CheckLastExitCode { diff --git a/ci/x86_64-windows-debug.ps1 b/ci/x86_64-windows-debug.ps1 index 003cd35433a9f2c73b0c16ab10b16d2a2343c20b..130bb0202be935dbd88cce6da16cf6847bf8e4d0 100644 --- a/ci/x86_64-windows-debug.ps1 +++ b/ci/x86_64-windows-debug.ps1 @@ -6,13 +6,13 @@ $PREFIX_PATH = "$($Env:USERPROFILE)\$ZIG_LLVM_CLANG_LLD_NAME" $ZIG = "$PREFIX_PATH\bin\zig.exe" $ZIG_LIB_DIR = "$(Get-Location)\lib" -if (!(Test-Path "..\$ZIG_LLVM_CLANG_LLD_NAME.zip")) { +if (!(Test-Path "$PREFIX_PATH.zip")) { Write-Output "Downloading $ZIG_LLVM_CLANG_LLD_URL" - Invoke-WebRequest -Uri "$ZIG_LLVM_CLANG_LLD_URL" -OutFile "..\$ZIG_LLVM_CLANG_LLD_NAME.zip" + Invoke-WebRequest -Uri "$ZIG_LLVM_CLANG_LLD_URL" -OutFile "$PREFIX_PATH.zip" Write-Output "Extracting..." Add-Type -AssemblyName System.IO.Compression.FileSystem ; - [System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD\..\$ZIG_LLVM_CLANG_LLD_NAME.zip", "$PWD\..") + [System.IO.Compression.ZipFile]::ExtractToDirectory("$PREFIX_PATH.zip", "$PREFIX_PATH\..") } function CheckLastExitCode { diff --git a/ci/x86_64-windows-release.ps1 b/ci/x86_64-windows-release.ps1 index 50a4d9ec09a24406cd29fc4111e7f2f997735284..8f5a5ba8a7057c1117b3b020eaeb02f9abc40924 100644 --- a/ci/x86_64-windows-release.ps1 +++ b/ci/x86_64-windows-release.ps1 @@ -6,13 +6,13 @@ $PREFIX_PATH = "$($Env:USERPROFILE)\$ZIG_LLVM_CLANG_LLD_NAME" $ZIG = "$PREFIX_PATH\bin\zig.exe" $ZIG_LIB_DIR = "$(Get-Location)\lib" -if (!(Test-Path "..\$ZIG_LLVM_CLANG_LLD_NAME.zip")) { +if (!(Test-Path "$PREFIX_PATH.zip")) { Write-Output "Downloading $ZIG_LLVM_CLANG_LLD_URL" - Invoke-WebRequest -Uri "$ZIG_LLVM_CLANG_LLD_URL" -OutFile "..\$ZIG_LLVM_CLANG_LLD_NAME.zip" + Invoke-WebRequest -Uri "$ZIG_LLVM_CLANG_LLD_URL" -OutFile "$PREFIX_PATH.zip" Write-Output "Extracting..." Add-Type -AssemblyName System.IO.Compression.FileSystem ; - [System.IO.Compression.ZipFile]::ExtractToDirectory("$PWD\..\$ZIG_LLVM_CLANG_LLD_NAME.zip", "$PWD\..") + [System.IO.Compression.ZipFile]::ExtractToDirectory("$PREFIX_PATH.zip", "$PREFIX_PATH\..") } function CheckLastExitCode { -- 2.54.0