From 43eceffb5933994741e50c6615495d0eb0cfe1dc Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Tue, 16 May 2023 08:55:46 -0700 Subject: [PATCH] Make CircleCI caches for hermesc be version dependent (#37452) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/37452 Fixes #37428 We do have cache poisoning for hermesc on Windows and Linux due to reusing the same cache key among different React Native version. This fixes it by specifying a cache key which is version dependent + it invalidates the caches by defining a new key. Changelog: [Internal] [Fixed] - Make CircleCI caches for hermesc be version dependent Reviewed By: dmytrorykun Differential Revision: D45909178 fbshipit-source-id: 21343df7bbc6178b5ef531137dbedd00d9b64239 --- .circleci/config.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 206562552df160..3dfe84d0b37c8a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,8 @@ references: hermes_workspace_cache_key: &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }} hermes_workspace_debug_cache_key: &hermes_workspace_debug_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }} hermes_workspace_release_cache_key: &hermes_workspace_release_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }} - hermes_windows_cache_key: &hermes_windows_cache_key v3-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "tmp/hermes/hermesversion" }} + hermes_linux_cache_key: &hermes_linux_cache_key v1-hermes-{{ .Environment.CIRCLE_JOB }}-linux-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }} + hermes_windows_cache_key: &hermes_windows_cache_key v1-hermes-{{ .Environment.CIRCLE_JOB }}-windows-{{ checksum "tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }} hermes_tarball_debug_cache_key: &hermes_tarball_debug_cache_key v4-hermes-tarball-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }} hermes_tarball_release_cache_key: &hermes_tarball_release_cache_key v3-hermes-tarball-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }} pods_cache_key: &pods_cache_key v8-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}-{{ checksum "packages/rn-tester/Podfile" }} @@ -1148,6 +1149,7 @@ jobs: resource_class: "xlarge" working_directory: /root steps: + - checkout_code_with_cache - run: name: Install dependencies command: | @@ -1155,8 +1157,9 @@ jobs: apt install -y git openssh-client cmake build-essential \ libreadline-dev libicu-dev zip python3 - *attach_hermes_workspace + - get_react_native_version - restore_cache: - key: *hermes_workspace_cache_key + key: *hermes_linux_cache_key - run: name: Set up workspace command: | @@ -1175,7 +1178,7 @@ jobs: cp /tmp/hermes/build/bin/hermesc /tmp/hermes/linux64-bin/. fi - save_cache: - key: *hermes_workspace_cache_key + key: *hermes_linux_cache_key paths: - /tmp/hermes/linux64-bin/ - /tmp/hermes/hermes/destroot/ @@ -1296,7 +1299,14 @@ jobs: - MSBUILD_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin' - CMAKE_DIR: 'C:\Program Files\CMake\bin' steps: + - checkout_code_with_cache - *attach_hermes_workspace + - run: + name: Get /tmp/react-native-version cache file + command: | + $VERSION=cat packages/react-native/package.json | jq -r '.version' + echo "$VERSION" > /tmp/react-native-version + - restore_cache: key: *hermes_windows_cache_key - run: