From ddfd0bde2af9bd1e538b26df81a885062eac6e00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Cortier?= Date: Mon, 5 Aug 2024 07:53:09 -0400 Subject: [PATCH] ci(nuget-publish): fix build for Android (#516) The Android 19 toolchain is not included anymore, so we bump the minimum supported version to Android 21 for i686 (x86) architecture. --- .github/workflows/nuget-publish.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/nuget-publish.yml b/.github/workflows/nuget-publish.yml index b9edf889..15fd3956 100644 --- a/.github/workflows/nuget-publish.yml +++ b/.github/workflows/nuget-publish.yml @@ -92,7 +92,7 @@ jobs: if: matrix.os == 'android' shell: pwsh run: | - $CargoConfigFile = "~/.cargo/config" + $CargoConfigFile = "~/.cargo/config.toml" $AndroidToolchain="${Env:ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64" Get-ChildItem -Path $AndroidToolchain "libunwind.a" -Recurse | ForEach-Object { @@ -104,9 +104,11 @@ jobs: } } + Get-ChildItem -Path "$AndroidToolchain/bin/" + echo "[target.i686-linux-android]" >> $CargoConfigFile - echo "linker=`"$AndroidToolchain/bin/i686-linux-android19-clang`"" >> $CargoConfigFile - echo "CC_i686-linux-android=$AndroidToolchain/bin/i686-linux-android19-clang" >> $Env:GITHUB_ENV + echo "linker=`"$AndroidToolchain/bin/i686-linux-android21-clang`"" >> $CargoConfigFile + echo "CC_i686-linux-android=$AndroidToolchain/bin/i686-linux-android21-clang" >> $Env:GITHUB_ENV echo "AR_i686-linux-android=$AndroidToolchain/bin/llvm-ar" >> $Env:GITHUB_ENV echo "[target.x86_64-linux-android]" >> $CargoConfigFile