Skip to content

Commit

Permalink
Merge #934
Browse files Browse the repository at this point in the history
934: Automatically detect latest installed Android NDK r=Bromeon a=Bromeon

bors r+

Co-authored-by: Jan Haller <[email protected]>
  • Loading branch information
bors[bot] and Bromeon authored Aug 30, 2022
2 parents e55c804 + ec4f97b commit 625937c
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/full-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -244,8 +244,16 @@ jobs:
sudo apt-get update
sudo apt-get install llvm-dev libclang-dev clang g++-multilib gcc-multilib libc6-dev libc6-dev-arm64-cross
# Relies on ls listing alphabetically, NDK versions having fixed
# digits, and the folder not containing any other files
- name: "Find highest Android NDK version"
run: |
highestNdk=$(ls $ANDROID_SDK_ROOT/ndk | tail -n1)
echo "Highest Android NDK: $highestNdk"
echo "ANDROID_NDK_VERSION=$highestNdk" >> $GITHUB_ENV
# See https://github.com/godot-rust/godot-rust/pull/920
- name: "Workaround Android NDK due to Rust bug"
- name: "Found version ${{ env.ANDROID_NDK_VERSION }}. Workaround Rust bug..."
run: >
find -L $ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION -name libunwind.a
-execdir sh -c 'echo "INPUT(-lunwind)" > libgcc.a' \;
Expand All @@ -256,8 +264,6 @@ jobs:
export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER=$ANDROID_SDK_ROOT/ndk/$ANDROID_NDK_VERSION/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi21-clang++
cargo build --target aarch64-linux-android --release
cargo build --target armv7-linux-androideabi --release
env:
ANDROID_NDK_VERSION: 25.0.8775105
integration-test-godot:
name: itest-godot-${{ matrix.godot }}${{ matrix.postfix }}
Expand Down

0 comments on commit 625937c

Please sign in to comment.