Skip to content

Commit 8f79f94

Browse files
committed
Auto merge of #2504 - JohnTitor:sparc-testing, r=JohnTitor
sparc64: Update debian image to 11 (2021-10-20) to fix segfault on CI Fixes #2503 r? `@ghost`
2 parents 89d0bd5 + 3e65f55 commit 8f79f94

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/bors.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,7 @@ jobs:
132132
# See this comment for more details:
133133
# https://github.com/rust-lang/libc/pull/2225#issuecomment-880696737
134134
#wasm32-wasi,
135-
# FIXME: Recent nightly causes a segfault on libc-test
136-
#sparc64-unknown-linux-gnu,
135+
sparc64-unknown-linux-gnu,
137136
wasm32-unknown-emscripten,
138137
x86_64-linux-android,
139138
x86_64-unknown-linux-gnux32,

ci/linux-sparc64.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ set -ex
55
mkdir -m 777 /qemu
66
cd /qemu
77

8-
curl --retry 5 -LO https://cdimage.debian.org/cdimage/ports/snapshots/2020-10-13/debian-10.0.0-sparc64-NETINST-1.iso
9-
7z e debian-10.0.0-sparc64-NETINST-1.iso install/initrd.gz
10-
7z e debian-10.0.0-sparc64-NETINST-1.iso install/vmlinux
8+
curl --retry 5 -LO https://cdimage.debian.org/cdimage/ports/snapshots/2021-10-20/debian-11.0.0-sparc64-NETINST-1.iso
9+
7z e debian-11.0.0-sparc64-NETINST-1.iso install/initrd.gz
10+
7z e debian-11.0.0-sparc64-NETINST-1.iso install/vmlinux
1111
mv vmlinux kernel
12-
rm debian-10.0.0-sparc64-NETINST-1.iso
12+
rm debian-11.0.0-sparc64-NETINST-1.iso
1313

1414
mkdir init
1515
cd init

0 commit comments

Comments
 (0)