summaryrefslogtreecommitdiff
path: root/Meta/Azure
diff options
context:
space:
mode:
authorAndrew Kaster <akaster@serenityos.org>2022-09-22 07:42:08 -0600
committerTim Flynn <trflynn89@pm.me>2022-09-22 11:07:21 -0400
commitcca54e95353017bf049196c3a3f697b9a9844eca (patch)
tree408f921b22d378d2c39b82c14113a05c07139e3f /Meta/Azure
parenta52d346839b8e2c5c94a21379cfb8750ce6f1666 (diff)
downloadserenity-cca54e95353017bf049196c3a3f697b9a9844eca.zip
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.
Diffstat (limited to 'Meta/Azure')
-rw-r--r--Meta/Azure/Caches.yml12
-rw-r--r--Meta/Azure/Lagom.yml3
2 files changed, 0 insertions, 15 deletions
diff --git a/Meta/Azure/Caches.yml b/Meta/Azure/Caches.yml
index 0f412847d3..5fda3cf096 100644
--- a/Meta/Azure/Caches.yml
+++ b/Meta/Azure/Caches.yml
@@ -10,8 +10,6 @@ parameters:
toolchain_ccache_path: ''
toolchain_ccache_size: $(CCACHE_MAXSIZE)
with_remote_data_caches: true
- ndk_version: ''
- with_ndk_cache: false
steps:
- script: |
@@ -84,13 +82,3 @@ steps:
"unicode_locale" | Meta/CMake/locale_data.cmake
path: $(Build.SourcesDirectory)/${{ parameters.build_directory }}/CLDR
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'
diff --git a/Meta/Azure/Lagom.yml b/Meta/Azure/Lagom.yml
index 269bc43736..253b146d4c 100644
--- a/Meta/Azure/Lagom.yml
+++ b/Meta/Azure/Lagom.yml
@@ -42,9 +42,6 @@ jobs:
build_directory: 'Meta/Lagom/Build'
serenity_ccache_path: '$(SERENITY_CCACHE_DIR)'
with_remote_data_caches: true
- ${{ if eq(parameters.os, 'Android') }}:
- with_ndk_cache: true
- ndk_version: '$(ndk_version)'
${{ if eq(parameters.os, 'macOS') }}:
ccache_version: 2
serenity_ccache_size: '2G'