@@ -62,7 +62,8 @@ references:
62
62
hermes_workspace_cache_key : &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
63
63
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" }}
64
64
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" }}
66
67
hermes_tarball_debug_cache_key : &hermes_tarball_debug_cache_key v4-hermes-tarball-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
67
68
hermes_tarball_release_cache_key : &hermes_tarball_release_cache_key v3-hermes-tarball-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
68
69
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:
314
315
- run :
315
316
name : Get React Native version
316
317
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' )
318
319
# Save the react native version we are building in a file so we can use that file as part of the cache key.
319
320
echo "$VERSION" > /tmp/react-native-version
320
321
echo "React Native Version is $(cat /tmp/react-native-version)"
@@ -1146,17 +1147,18 @@ jobs:
1146
1147
docker :
1147
1148
- image : debian:bullseye
1148
1149
resource_class : " xlarge"
1149
- working_directory : /root
1150
1150
steps :
1151
+ - checkout_code_with_cache
1151
1152
- run :
1152
1153
name : Install dependencies
1153
1154
command : |
1154
1155
apt update
1155
1156
apt install -y git openssh-client cmake build-essential \
1156
- libreadline-dev libicu-dev zip python3
1157
+ libreadline-dev libicu-dev jq zip python3
1157
1158
- *attach_hermes_workspace
1159
+ - get_react_native_version
1158
1160
- restore_cache :
1159
- key : *hermes_workspace_cache_key
1161
+ key : *hermes_linux_cache_key
1160
1162
- run :
1161
1163
name : Set up workspace
1162
1164
command : |
@@ -1175,7 +1177,7 @@ jobs:
1175
1177
cp /tmp/hermes/build/bin/hermesc /tmp/hermes/linux64-bin/.
1176
1178
fi
1177
1179
- save_cache :
1178
- key : *hermes_workspace_cache_key
1180
+ key : *hermes_linux_cache_key
1179
1181
paths :
1180
1182
- /tmp/hermes/linux64-bin/
1181
1183
- /tmp/hermes/hermes/destroot/
@@ -1296,7 +1298,9 @@ jobs:
1296
1298
- MSBUILD_DIR : ' C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin'
1297
1299
- CMAKE_DIR : ' C:\Program Files\CMake\bin'
1298
1300
steps :
1301
+ - checkout_code_with_cache
1299
1302
- *attach_hermes_workspace
1303
+ - get_react_native_version
1300
1304
- restore_cache :
1301
1305
key : *hermes_windows_cache_key
1302
1306
- run :
0 commit comments