mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-04 04:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25627 from alexrp/qemu-10.1.1-patched

Browse Source 
`ci`: switch to patched QEMU 10.1.1.1
This commit is contained in:
Alex Rønne Petersen 2025-10-19 11:50:23 +02:00 committed by GitHub
commit 328b121240
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/x86_64-linux-debug-llvm.sh
View File

@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
PREFIX="$HOME/deps/$CACHE_BASENAME" PREFIX="$HOME/deps/$CACHE_BASENAME"
ZIG="$PREFIX/bin/zig" ZIG="$PREFIX/bin/zig"
export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1/bin:$HOME/local/bin:$PATH" export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1.1/bin:$HOME/local/bin:$PATH"
# Override the cache directories because they won't actually help other CI runs # Override the cache directories because they won't actually help other CI runs
# which will be testing alternate versions of zig, and ultimately would just # which will be testing alternate versions of zig, and ultimately would just

2
ci/x86_64-linux-debug.sh
View File

@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
PREFIX="$HOME/deps/$CACHE_BASENAME" PREFIX="$HOME/deps/$CACHE_BASENAME"
ZIG="$PREFIX/bin/zig" ZIG="$PREFIX/bin/zig"
export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1/bin:$HOME/local/bin:$PATH" export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1.1/bin:$HOME/local/bin:$PATH"
# Override the cache directories because they won't actually help other CI runs # Override the cache directories because they won't actually help other CI runs
# which will be testing alternate versions of zig, and ultimately would just # which will be testing alternate versions of zig, and ultimately would just

2
ci/x86_64-linux-release.sh
View File

@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
PREFIX="$HOME/deps/$CACHE_BASENAME" PREFIX="$HOME/deps/$CACHE_BASENAME"
ZIG="$PREFIX/bin/zig" ZIG="$PREFIX/bin/zig"
export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1/bin:$HOME/local/bin:$PATH" export PATH="$HOME/deps/wasmtime-v29.0.0-x86_64-linux:$HOME/deps/qemu-linux-x86_64-10.1.1.1/bin:$HOME/local/bin:$PATH"
# Override the cache directories because they won't actually help other CI runs # Override the cache directories because they won't actually help other CI runs
# which will be testing alternate versions of zig, and ultimately would just # which will be testing alternate versions of zig, and ultimately would just

5
lib/std/Thread.zig
View File

@ -1695,11 +1695,6 @@ test "Thread.getCurrentId" {
test "thread local storage" { test "thread local storage" {
if (builtin.single_threaded) return error.SkipZigTest; if (builtin.single_threaded) return error.SkipZigTest;
if (builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) {
// https://github.com/ziglang/zig/issues/24061
return error.SkipZigTest;
}
const thread1 = try Thread.spawn(.{}, testTls, .{}); const thread1 = try Thread.spawn(.{}, testTls, .{});
const thread2 = try Thread.spawn(.{}, testTls, .{}); const thread2 = try Thread.spawn(.{}, testTls, .{});
try testTls(); try testTls();