From 3de33b9bcfd20cc230dc36a038e207e5e353a744 Mon Sep 17 00:00:00 2001 From: Junho Choi Date: Fri, 17 May 2024 12:53:50 +0900 Subject: [PATCH] ci: fix android build - A new cargo-ndk release requires Cargo.toml of a package, not a workspace. - Current ubuntu image(22.04) already has NDK 25, use a builtin ndk instead to remove warning and improve build time. https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2204-Readme.md --- .github/workflows/stable.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.github/workflows/stable.yml b/.github/workflows/stable.yml index f1b217b4eb..470be15219 100644 --- a/.github/workflows/stable.yml +++ b/.github/workflows/stable.yml @@ -281,7 +281,6 @@ jobs: android_ndk_lts: runs-on: ubuntu-latest env: - NDK_LTS_VER: "25" API_LEVEL: "21" strategy: matrix: @@ -313,13 +312,5 @@ jobs: - name: Install cargo-ndk run: cargo install cargo-ndk - - name: Download NDK - run: curl --http1.1 -O https://dl.google.com/android/repository/android-ndk-r${{ env.NDK_LTS_VER }}-linux.zip - - - name: Extract NDK - run: unzip -q android-ndk-r${{ env.NDK_LTS_VER }}-linux.zip - - name: Run cargo ndk - run: cargo ndk -t ${{ matrix.arch }} -p ${{ env.API_LEVEL }} -- build --verbose --features ffi - env: - ANDROID_NDK_HOME: ${{ github.workspace }}/android-ndk-r${{ env.NDK_LTS_VER }} + run: cargo ndk --manifest-path quiche/Cargo.toml -t ${{ matrix.arch }} -p ${{ env.API_LEVEL }} -- build --verbose --features ffi