Skip to content

Commit 328b121

Browse files
authored
Merge pull request #25627 from alexrp/qemu-10.1.1-patched
`ci`: switch to patched QEMU 10.1.1.1
2 parents 38caa49 + 653a191 commit 328b121

4 files changed

Lines changed: 3 additions & 8 deletions

File tree

ci/x86_64-linux-debug-llvm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
1111
PREFIX="$HOME/deps/$CACHE_BASENAME"
1212
ZIG="$PREFIX/bin/zig"
1313

14-
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"
14+
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"
1515

1616
# Override the cache directories because they won't actually help other CI runs
1717
# which will be testing alternate versions of zig, and ultimately would just

ci/x86_64-linux-debug.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
1111
PREFIX="$HOME/deps/$CACHE_BASENAME"
1212
ZIG="$PREFIX/bin/zig"
1313

14-
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"
14+
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"
1515

1616
# Override the cache directories because they won't actually help other CI runs
1717
# which will be testing alternate versions of zig, and ultimately would just

ci/x86_64-linux-release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CACHE_BASENAME="zig+llvm+lld+clang-$TARGET-0.16.0-dev.104+689461e31"
1111
PREFIX="$HOME/deps/$CACHE_BASENAME"
1212
ZIG="$PREFIX/bin/zig"
1313

14-
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"
14+
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"
1515

1616
# Override the cache directories because they won't actually help other CI runs
1717
# which will be testing alternate versions of zig, and ultimately would just

lib/std/Thread.zig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1695,11 +1695,6 @@ test "Thread.getCurrentId" {
16951695
test "thread local storage" {
16961696
if (builtin.single_threaded) return error.SkipZigTest;
16971697

1698-
if (builtin.cpu.arch == .armeb or builtin.cpu.arch == .thumbeb) {
1699-
// https://github.com/ziglang/zig/issues/24061
1700-
return error.SkipZigTest;
1701-
}
1702-
17031698
const thread1 = try Thread.spawn(.{}, testTls, .{});
17041699
const thread2 = try Thread.spawn(.{}, testTls, .{});
17051700
try testTls();

0 commit comments

Comments
 (0)