From 3127454642dbc28ec2e2930b75524276f3386133 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Wed, 25 Aug 2021 06:57:47 -0400 Subject: CI: Skip Unicode caches for Fuzzer build There is a bit of a race here between the Fuzzer and non-Fuzzer Lagom builds. If the Unicode caches are empty, and the Fuzzer build completes first, then the UCD and CLDR directories will be empty or won't exist. Skip handling the Unicode caches for this build. --- Meta/Azure/Caches.yml | 22 ++++++++++++---------- Meta/Azure/Lagom.yml | 4 ++++ 2 files changed, 16 insertions(+), 10 deletions(-) (limited to 'Meta') diff --git a/Meta/Azure/Caches.yml b/Meta/Azure/Caches.yml index 5d1f2abfb2..55d30688f1 100644 --- a/Meta/Azure/Caches.yml +++ b/Meta/Azure/Caches.yml @@ -4,6 +4,7 @@ parameters: toolchain: 'gcc' build_directory: '' ccache_version: 1 # Increment this number if CI has trouble with ccache. + with_unicode_caches: true steps: - script: | @@ -32,17 +33,18 @@ steps: path: $(CCACHE_DIR) displayName: 'Compiler Cache' - - task: Cache@2 - inputs: - key: '"unicode_data" | Userland/Libraries/LibUnicode/unicode_data.cmake' - path: $(Build.SourcesDirectory)/${{ parameters.build_directory }}/UCD - displayName: 'UnicodeData Cache' + - ${{ if eq(parameters.with_unicode_caches, true) }}: + - task: Cache@2 + inputs: + key: '"unicode_data" | Userland/Libraries/LibUnicode/unicode_data.cmake' + path: $(Build.SourcesDirectory)/${{ parameters.build_directory }}/UCD + displayName: 'UnicodeData Cache' - - task: Cache@2 - inputs: - key: '"unicode_locale" | Userland/Libraries/LibUnicode/unicode_data.cmake' - path: $(Build.SourcesDirectory)/${{ parameters.build_directory }}/CLDR - displayName: 'UnicodeLocale Cache' + - task: Cache@2 + inputs: + key: '"unicode_locale" | Userland/Libraries/LibUnicode/unicode_data.cmake' + path: $(Build.SourcesDirectory)/${{ parameters.build_directory }}/CLDR + displayName: 'UnicodeLocale Cache' - script: | ccache -M 5G diff --git a/Meta/Azure/Lagom.yml b/Meta/Azure/Lagom.yml index 61d1e8dea6..c5ad99586d 100644 --- a/Meta/Azure/Lagom.yml +++ b/Meta/Azure/Lagom.yml @@ -36,6 +36,10 @@ jobs: arch: 'Lagom' toolchain: '$(toolchain)' build_directory: 'Meta/Lagom/Build' + ${{ if eq(parameters.fuzzer, 'Fuzz') }}: + with_unicode_caches: false + ${{ if eq(parameters.fuzzer, 'NoFuzz') }}: + with_unicode_caches: true - script: | mkdir -p Meta/Lagom/Build -- cgit v1.2.3