Fix CI builds after update (#1114)

This commit is contained in:
Tom M 2022-06-10 09:47:08 +02:00 committed by GitHub
parent a293761e44
commit b675a392ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions

View file

@ -52,6 +52,7 @@ variables:
# This is a symlink pointing to the real Android NDK # This is a symlink pointing to the real Android NDK
# Must be the same as $ANDROID_NDK_HOME see: # Must be the same as $ANDROID_NDK_HOME see:
# https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md # https://github.com/actions/virtual-environments/blob/main/images/linux/Ubuntu2004-README.md
# We cannot use $ANDROID_NDK_HOME because this is an environment variable, but here, we need a compile-time constant.
NDK: '/usr/local/lib/android/sdk/ndk-bundle' NDK: '/usr/local/lib/android/sdk/ndk-bundle'
# All the built binaries, libs and their headers will be installed here # All the built binaries, libs and their headers will be installed here
@ -197,6 +198,11 @@ jobs:
displayName: 'apt-get install' displayName: 'apt-get install'
condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true')) condition: and(succeeded(), ne(variables.CACHE_RESTORED, 'true'))
- script: |
set -ex
ln -sfn $ANDROID_SDK_ROOT/ndk/21.4.7075529 $ANDROID_NDK_ROOT
displayName: 'Use NDK r22'
- script: | - script: |
set -e set -e

View file

@ -62,7 +62,6 @@ jobs:
echo Can execute `nproc` make jobs in parallel echo Can execute `nproc` make jobs in parallel
cmake --version cmake --version
cmake -E make_directory ${{github.workspace}}/build cmake -E make_directory ${{github.workspace}}/build
sudo ln -s /usr/bin/clang-tidy-10 /usr/bin/clang-tidy
which clang-tidy || true which clang-tidy || true
ls -la `which clang-tidy` || true ls -la `which clang-tidy` || true
echo $PATH echo $PATH