From 5c0f1d5b8afdbf57e4533735b30f39707eb21b07 Mon Sep 17 00:00:00 2001
From: Timothy Flynn <trflynn89@pm.me>
Date: Tue, 9 Aug 2022 08:27:58 -0400
Subject: CI: Add a restoration key for Azure's remote data caches

We do a similar trick for the compiler cache. This allows each builder
to separately push their local data cache (if it changed) while pulling
a shared cache, without the race outlined in commit 3127454. This is
needed for a subsequent commit which will enable this cache for Fuzzer
builds.
---
 Meta/Azure/Caches.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Meta/Azure/Caches.yml b/Meta/Azure/Caches.yml
index 8e9d630b53..78bcb4f384 100644
--- a/Meta/Azure/Caches.yml
+++ b/Meta/Azure/Caches.yml
@@ -62,19 +62,25 @@ steps:
   - ${{ if eq(parameters.with_remote_data_caches, true) }}:
     - task: Cache@2
       inputs:
-        key: '"time_zone_data" | Meta/CMake/time_zone_data.cmake'
+        key: '"time_zone_data" | Meta/CMake/time_zone_data.cmake | "$(timestamp)"'
+        restoreKeys: |
+            "time_zone_data" | Meta/CMake/time_zone_data.cmake
         path: $(Build.SourcesDirectory)/${{ parameters.build_directory }}/TZDB
       displayName: 'TimeZoneData Cache'
 
     - task: Cache@2
       inputs:
-        key: '"unicode_data" | Meta/CMake/unicode_data.cmake'
+        key: '"unicode_data" | Meta/CMake/unicode_data.cmake | "$(timestamp)"'
+        restoreKeys: |
+            "unicode_data" | Meta/CMake/unicode_data.cmake
         path: $(Build.SourcesDirectory)/${{ parameters.build_directory }}/UCD
       displayName: 'UnicodeData Cache'
 
     - task: Cache@2
       inputs:
-        key: '"unicode_locale" | Meta/CMake/unicode_data.cmake'
+        key: '"unicode_locale" | Meta/CMake/unicode_data.cmake | "$(timestamp)"'
+        restoreKeys: |
+            "unicode_locale" | Meta/CMake/unicode_data.cmake
         path: $(Build.SourcesDirectory)/${{ parameters.build_directory }}/CLDR
       displayName: 'UnicodeLocale Cache'
 
-- 
cgit v1.2.3