Skip to content

Commit

Permalink
Auto merge of #2990 - JohnTitor:revive-x86_64-android, r=JohnTitor
Browse files Browse the repository at this point in the history
Revive `x86_64-linux-android` CI with an old nightly

Signed-off-by: Yuki Okushi <jtitor@2k36.org>
  • Loading branch information
bors committed Nov 3, 2022
2 parents 301790e + eddc5a3 commit 875f3a6
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/bors.yml
Expand Up @@ -159,10 +159,7 @@ jobs:
#wasm32-wasi,
sparc64-unknown-linux-gnu,
wasm32-unknown-emscripten,
# FIXME: Started to fail since 2022-10-10:
# error: linking with `x86_64-linux-android-gcc` failed: exit status: 1
# ld: error: cannot find -lunwind
# x86_64-linux-android,
x86_64-linux-android,
x86_64-unknown-linux-gnux32,
x86_64-unknown-linux-musl,
# FIXME: It seems some items in `src/unix/mod.rs`
Expand Down
8 changes: 7 additions & 1 deletion ci/install-rust.sh
Expand Up @@ -8,7 +8,13 @@ toolchain=
if [ -n "$TOOLCHAIN" ]; then
toolchain=$TOOLCHAIN
else
toolchain=nightly
# Pin the nightly version as newer nightly versions break CI,
# https://github.com/rust-lang/rust/issues/103673 contains related information.
if [ "$TARGET" = "x86_64-linux-android" ]; then
toolchain=nightly-2022-10-09
else
toolchain=nightly
fi
fi
if [ "$OS" = "windows" ]; then
: "${TARGET?The TARGET environment variable must be set.}"
Expand Down

0 comments on commit 875f3a6

Please sign in to comment.