Skip to content

Commit

Permalink
Revert "ci: manually point ANDROID_NDK_ROOT to latest supplied version"
Browse files Browse the repository at this point in the history
This reverts commit 4895a29.

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]: actions/runner-images#5879 (comment)
  • Loading branch information
MarijnS95 authored and kchibisov committed Sep 11, 2022
1 parent 7af1163 commit 2a2733b
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/ci.yml
Expand Up @@ -67,14 +67,10 @@ 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 Linux dependencies
if: (matrix.platform.os == 'ubuntu-latest')
run: sudo apt-get update && sudo apt-get install pkg-config cmake libfreetype6-dev libfontconfig1-dev

- name: Install GCC Multilib
if: (matrix.platform.os == 'ubuntu-latest') && contains(matrix.platform.target, 'i686')
run: sudo dpkg --add-architecture i386 && sudo apt-get update && sudo apt-get install g++-multilib gcc-multilib libfreetype6-dev:i386 libfontconfig1-dev:i386
Expand Down

0 comments on commit 2a2733b

Please sign in to comment.