From e18fb97cbf81bd976c31d707632935f1fff7a5ab Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Tue, 6 Sep 2022 15:18:55 +0200 Subject: [PATCH] Revert "ci: manually point ANDROID_NDK_ROOT to latest supplied version" This reverts commit 4895a29e92a6fa9f7640558bd2676cdc48f66d8d. GitHub Actions' runner-images readded this environment variable on my request [1] as it wasn't strictly related to the deprecated and removed `ndk-bundle` NDK release. Back out of the workaround to keep CI scripts tidy. [1]: https://github.com/actions/runner-images/issues/5879#issuecomment-1197811704 --- .github/workflows/ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ef4336561..9504d561de 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,11 +66,6 @@ jobs: targets: ${{ matrix.platform.target }} components: clippy - - name: Setup NDK path - shell: bash - # "Temporary" workaround until https://github.com/actions/virtual-environments/issues/5879#issuecomment-1195156618 - # gets looked into. - run: echo "ANDROID_NDK_ROOT=$ANDROID_NDK_LATEST_HOME" >> $GITHUB_ENV - name: Install GCC Multilib if: (matrix.platform.os == 'ubuntu-latest') && contains(matrix.platform.target, 'i686') run: sudo apt-get update && sudo apt-get install gcc-multilib