mirror of
https://github.com/rust-windowing/winit.git
synced 2026-08-29 21:00:04 -04:00
Revert "ci: manually point ANDROID_NDK_ROOT to latest supplied version"
This reverts commit 4895a29e92.
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
This commit is contained in:
committed by
Kirill Chibisov
parent
7af1163ee7
commit
2a2733b2d1
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user