Skip to content

Commit eddc5a3

Browse files
committed
Revive x86_64-linux-android CI with an old nightly
Signed-off-by: Yuki Okushi <[email protected]>
1 parent 7d615f0 commit eddc5a3

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

.github/workflows/bors.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,7 @@ jobs:
159159
#wasm32-wasi,
160160
sparc64-unknown-linux-gnu,
161161
wasm32-unknown-emscripten,
162-
# FIXME: Started to fail since 2022-10-10:
163-
# error: linking with `x86_64-linux-android-gcc` failed: exit status: 1
164-
# ld: error: cannot find -lunwind
165-
# x86_64-linux-android,
162+
x86_64-linux-android,
166163
x86_64-unknown-linux-gnux32,
167164
x86_64-unknown-linux-musl,
168165
# FIXME: It seems some items in `src/unix/mod.rs`

ci/install-rust.sh

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ toolchain=
88
if [ -n "$TOOLCHAIN" ]; then
99
toolchain=$TOOLCHAIN
1010
else
11-
toolchain=nightly
11+
# Pin the nightly version as newer nightly versions break CI,
12+
# https://github.com/rust-lang/rust/issues/103673 contains related information.
13+
if [ "$TARGET" = "x86_64-linux-android" ]; then
14+
toolchain=nightly-2022-10-09
15+
else
16+
toolchain=nightly
17+
fi
1218
fi
1319
if [ "$OS" = "windows" ]; then
1420
: "${TARGET?The TARGET environment variable must be set.}"

0 commit comments

Comments
 (0)