Skip to content

Commit 4357ea5

Browse files
cortinicofacebook-github-bot
authored andcommitted
Make CircleCI caches for hermesc be version dependent (#37452)
Summary: Pull Request resolved: #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 Differential Revision: D45909178 fbshipit-source-id: 42516539c65f7dae079b653437c4157bf1b1aca0
1 parent 0a4a95f commit 4357ea5

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

.circleci/config.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ references:
6262
hermes_workspace_cache_key: &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
6363
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" }}
6464
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" }}
65-
hermes_windows_cache_key: &hermes_windows_cache_key v3-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "tmp/hermes/hermesversion" }}
65+
hermes_linux_cache_key: &hermes_linux_cache_key v1-hermes-{{ .Environment.CIRCLE_JOB }}-linux-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
66+
hermes_windows_cache_key: &hermes_windows_cache_key v1-hermes-{{ .Environment.CIRCLE_JOB }}-windows-{{ checksum "tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
6667
hermes_tarball_debug_cache_key: &hermes_tarball_debug_cache_key v4-hermes-tarball-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
6768
hermes_tarball_release_cache_key: &hermes_tarball_release_cache_key v3-hermes-tarball-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
6869
pods_cache_key: &pods_cache_key v8-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}-{{ checksum "packages/rn-tester/Podfile" }}
@@ -314,7 +315,7 @@ commands:
314315
- run:
315316
name: Get React Native version
316317
command: |
317-
VERSION=$( grep '"version"' packages/react-native/package.json | cut -d '"' -f 4 | head -1)
318+
VERSION=$(cat packages/react-native/package.json | jq -r '.version')
318319
# Save the react native version we are building in a file so we can use that file as part of the cache key.
319320
echo "$VERSION" > /tmp/react-native-version
320321
echo "React Native Version is $(cat /tmp/react-native-version)"
@@ -1146,17 +1147,18 @@ jobs:
11461147
docker:
11471148
- image: debian:bullseye
11481149
resource_class: "xlarge"
1149-
working_directory: /root
11501150
steps:
1151+
- checkout_code_with_cache
11511152
- run:
11521153
name: Install dependencies
11531154
command: |
11541155
apt update
11551156
apt install -y git openssh-client cmake build-essential \
1156-
libreadline-dev libicu-dev zip python3
1157+
libreadline-dev libicu-dev jq zip python3
11571158
- *attach_hermes_workspace
1159+
- get_react_native_version
11581160
- restore_cache:
1159-
key: *hermes_workspace_cache_key
1161+
key: *hermes_linux_cache_key
11601162
- run:
11611163
name: Set up workspace
11621164
command: |
@@ -1175,7 +1177,7 @@ jobs:
11751177
cp /tmp/hermes/build/bin/hermesc /tmp/hermes/linux64-bin/.
11761178
fi
11771179
- save_cache:
1178-
key: *hermes_workspace_cache_key
1180+
key: *hermes_linux_cache_key
11791181
paths:
11801182
- /tmp/hermes/linux64-bin/
11811183
- /tmp/hermes/hermes/destroot/
@@ -1296,7 +1298,9 @@ jobs:
12961298
- MSBUILD_DIR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin'
12971299
- CMAKE_DIR: 'C:\Program Files\CMake\bin'
12981300
steps:
1301+
- checkout_code_with_cache
12991302
- *attach_hermes_workspace
1303+
- get_react_native_version
13001304
- restore_cache:
13011305
key: *hermes_windows_cache_key
13021306
- run:

0 commit comments

Comments
 (0)