From b675a392ea998554729438ac3c911642793cf7cc Mon Sep 17 00:00:00 2001 From: Tom M Date: Fri, 10 Jun 2022 09:47:08 +0200 Subject: [PATCH] Fix CI builds after update (#1114) --- .azure/azure-pipelines-android.yml | 6 ++++++ .github/workflows/linux.yml | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.azure/azure-pipelines-android.yml b/.azure/azure-pipelines-android.yml index c289b1fd..ff24fab2 100644 --- a/.azure/azure-pipelines-android.yml +++ b/.azure/azure-pipelines-android.yml @@ -52,6 +52,7 @@ variables: # This is a symlink pointing to the real Android NDK # Must be the same as $ANDROID_NDK_HOME see: # 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' # All the built binaries, libs and their headers will be installed here @@ -197,6 +198,11 @@ jobs: displayName: 'apt-get install' 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: | set -e diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 9d7fc5fa..400d1fee 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -62,7 +62,6 @@ jobs: echo Can execute `nproc` make jobs in parallel cmake --version cmake -E make_directory ${{github.workspace}}/build - sudo ln -s /usr/bin/clang-tidy-10 /usr/bin/clang-tidy which clang-tidy || true ls -la `which clang-tidy` || true echo $PATH