CI: Remove Android NDK Cache

This actually never worked as a cache, the build has failed since it
tried to use it. This should restore the Android nightly build.
This commit is contained in:
Andrew Kaster 2022-09-22 07:42:08 -06:00 committed by Tim Flynn
parent a52d346839
commit cca54e9535
2 changed files with 0 additions and 15 deletions

View file

@ -10,8 +10,6 @@ parameters:
toolchain_ccache_path: '' toolchain_ccache_path: ''
toolchain_ccache_size: $(CCACHE_MAXSIZE) toolchain_ccache_size: $(CCACHE_MAXSIZE)
with_remote_data_caches: true with_remote_data_caches: true
ndk_version: ''
with_ndk_cache: false
steps: steps:
- script: | - script: |
@ -84,13 +82,3 @@ steps:
"unicode_locale" | Meta/CMake/locale_data.cmake "unicode_locale" | Meta/CMake/locale_data.cmake
path: $(Build.SourcesDirectory)/${{ parameters.build_directory }}/CLDR path: $(Build.SourcesDirectory)/${{ parameters.build_directory }}/CLDR
displayName: 'UnicodeLocale Cache' displayName: 'UnicodeLocale Cache'
- ${{ if eq(parameters.with_ndk_cache, true) }}:
- bash: |
echo "##vso[task.setvariable variable=ANDROID_SDK_ROOT;]$ANDROID_SDK_ROOT"
displayName: 'Set ANDROID_SDK_ROOT'
- task: Cache@2
inputs:
key: '"ndk" | "$(Agent.OS)" | "${{ parameters.ndk_version }}" '
path: $(ANDROID_SDK_ROOT)/ndk
displayName: 'Android NDK Cache'

View file

@ -42,9 +42,6 @@ jobs:
build_directory: 'Meta/Lagom/Build' build_directory: 'Meta/Lagom/Build'
serenity_ccache_path: '$(SERENITY_CCACHE_DIR)' serenity_ccache_path: '$(SERENITY_CCACHE_DIR)'
with_remote_data_caches: true with_remote_data_caches: true
${{ if eq(parameters.os, 'Android') }}:
with_ndk_cache: true
ndk_version: '$(ndk_version)'
${{ if eq(parameters.os, 'macOS') }}: ${{ if eq(parameters.os, 'macOS') }}:
ccache_version: 2 ccache_version: 2
serenity_ccache_size: '2G' serenity_ccache_size: '2G'