From 6ba7d0c435180b47280a2d9b9043dd71ed0c7c87 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 22 Sep 2023 16:20:11 -0700 Subject: [PATCH 1/2] reapply "CI: update x86_64 windows tarballs" This reverts commit 272a57eeedb9593f06434b59a8765c4a2b715792, reapplying commit bb98ffbe7fc8d21f48286432fe685312fd9b07cc. --- ci/x86_64-windows-debug.ps1 | 2 +- ci/x86_64-windows-release.ps1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/x86_64-windows-debug.ps1 b/ci/x86_64-windows-debug.ps1 index 1b98219de36876ca0f86373661a50a196741728e..c8cbb5006ad015a32249ba9c2f6a06c4fe589fc2 100644 --- a/ci/x86_64-windows-debug.ps1 +++ b/ci/x86_64-windows-debug.ps1 @@ -1,5 +1,5 @@ $TARGET = "$($Env:ARCH)-windows-gnu" -$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.12.0-dev.203+d3bc1cfc4" +$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.12.0-dev.888+130227492" $MCPU = "baseline" $ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip" $PREFIX_PATH = "$(Get-Location)\$ZIG_LLVM_CLANG_LLD_NAME" diff --git a/ci/x86_64-windows-release.ps1 b/ci/x86_64-windows-release.ps1 index 8a3ddafb73692b589c38acca07d6f3c99b28dca9..7ee4eb29d12093918d1ea4718f973e52d5d0b080 100644 --- a/ci/x86_64-windows-release.ps1 +++ b/ci/x86_64-windows-release.ps1 @@ -1,5 +1,5 @@ $TARGET = "$($Env:ARCH)-windows-gnu" -$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.12.0-dev.203+d3bc1cfc4" +$ZIG_LLVM_CLANG_LLD_NAME = "zig+llvm+lld+clang-$TARGET-0.12.0-dev.888+130227492" $MCPU = "baseline" $ZIG_LLVM_CLANG_LLD_URL = "https://ziglang.org/deps/$ZIG_LLVM_CLANG_LLD_NAME.zip" $PREFIX_PATH = "$(Get-Location)\$ZIG_LLVM_CLANG_LLD_NAME" -- 2.54.0 From e66e404d6156111ab58c23a30cbd126aefdea1f6 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 22 Sep 2023 16:20:57 -0700 Subject: [PATCH 2/2] these tests are failing on x86_64-windows too --- test/standalone/c_compiler/build.zig | 2 +- test/standalone/load_dynamic_library/build.zig | 2 +- test/standalone/shared_library/build.zig | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/test/standalone/c_compiler/build.zig b/test/standalone/c_compiler/build.zig index d7b21bd2ae62a0408199f10be0c2398af2985fe0..a2191f2f2eb5e972dad38e8dd14cb29fdd16e1c0 100644 --- a/test/standalone/c_compiler/build.zig +++ b/test/standalone/c_compiler/build.zig @@ -5,7 +5,7 @@ pub fn build(b: *std.Build) void { const test_step = b.step("test", "Test it"); b.default_step = test_step; - if (builtin.os.tag == .windows and builtin.cpu.arch == .aarch64) { + if (builtin.os.tag == .windows) { // https://github.com/ziglang/zig/issues/16965 return; } diff --git a/test/standalone/load_dynamic_library/build.zig b/test/standalone/load_dynamic_library/build.zig index 1244359cf8feb045ecaa79666ba3ebaba77d082b..5dc605e71111998657c33e879ce8e15a61692280 100644 --- a/test/standalone/load_dynamic_library/build.zig +++ b/test/standalone/load_dynamic_library/build.zig @@ -10,7 +10,7 @@ pub fn build(b: *std.Build) void { if (builtin.os.tag == .wasi) return; - if (builtin.os.tag == .windows and builtin.cpu.arch == .aarch64) { + if (builtin.os.tag == .windows) { // https://github.com/ziglang/zig/issues/16960 return; } diff --git a/test/standalone/shared_library/build.zig b/test/standalone/shared_library/build.zig index 36d49b03d3b3bc497705a3eab75550d70888148d..4b4a154225c47c9bebf2f6e775679a62db6a62ad 100644 --- a/test/standalone/shared_library/build.zig +++ b/test/standalone/shared_library/build.zig @@ -4,9 +4,7 @@ pub fn build(b: *std.Build) void { const test_step = b.step("test", "Test it"); b.default_step = test_step; - if (@import("builtin").os.tag == .windows and - @import("builtin").cpu.arch == .aarch64) - { + if (@import("builtin").os.tag == .windows) { // https://github.com/ziglang/zig/issues/16959 return; } -- 2.54.0