Skip to content

Commit 0edcbc3

Browse files
author
Dmitry Rykun
committed
fix: update CircleCI config to use the RN version in Hermes workspace caching
1 parent ed895c5 commit 0edcbc3

File tree

1 file changed

+32
-10
lines changed

1 file changed

+32
-10
lines changed

.circleci/config.yml

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ references:
5252
gems_cache_key: &gems_cache_key v1-gems-{{ checksum "Gemfile.lock" }}
5353
gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "ReactAndroid/gradle.properties" }}
5454
hermes_workspace_cache_key: &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
55-
hermes_workspace_debug_cache_key: &hermes_workspace_debug_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-debug-{{ checksum "/tmp/hermes/hermesversion" }}
56-
hermes_workspace_release_cache_key: &hermes_workspace_release_cache_key v2-hermes-{{ .Environment.CIRCLE_JOB }}-release-{{ checksum "/tmp/hermes/hermesversion" }}
55+
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" }}
56+
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" }}
5757
hermes_windows_cache_key: &hermes_windows_cache_key v3-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "tmp/hermes/hermesversion" }}
58-
hermes_tarball_debug_cache_key: &hermes_tarball_debug_cache_key v3-hermes-tarball-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version"}}
59-
hermes_tarball_release_cache_key: &hermes_tarball_release_cache_key v2-hermes-tarball-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version"}}
58+
hermes_tarball_debug_cache_key: &hermes_tarball_debug_cache_key v4-hermes-tarball-debug-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
59+
hermes_tarball_release_cache_key: &hermes_tarball_release_cache_key v3-hermes-tarball-release-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }}
6060
pods_cache_key: &pods_cache_key v8-pods-{{ .Environment.CIRCLE_JOB }}-{{ checksum "packages/rn-tester/Podfile.lock.bak" }}-{{ checksum "packages/rn-tester/Podfile" }}
6161
windows_yarn_cache_key: &windows_yarn_cache_key v1-win-yarn-cache-{{ arch }}-{{ checksum "yarn.lock" }}
6262
yarn_cache_key: &yarn_cache_key v5-yarn-cache-{{ .Environment.CIRCLE_JOB }}
@@ -256,6 +256,17 @@ commands:
256256
name: Report size of RNTester.app (analysis-bot)
257257
command: GITHUB_TOKEN="$PUBLIC_ANALYSISBOT_GITHUB_TOKEN_A""$PUBLIC_ANALYSISBOT_GITHUB_TOKEN_B" scripts/circleci/report-bundle-size.sh << parameters.platform >> || true
258258

259+
get_react_native_version:
260+
steps:
261+
- run:
262+
name: Get React Native version
263+
command: |
264+
VERSION=$( grep '"version"' package.json | cut -d '"' -f 4 | head -1)
265+
# Save the react native version we are building in a file so we can use that file as part of the cache key.
266+
echo "$VERSION" > /tmp/react-native-version
267+
echo "React Native Version is $(cat /tmp/react-native-version)"
268+
echo "Hermes commit is $(cat /tmp/hermes/hermesversion)"
269+
259270
with_hermes_tarball_cache_span:
260271
parameters:
261272
steps:
@@ -272,12 +283,7 @@ commands:
272283
type: string
273284
default: *hermes_tarball_artifacts_dir
274285
steps:
275-
- run:
276-
name: Get React Native version
277-
command: |
278-
VERSION=$( grep '"version"' package.json | cut -d '"' -f 4 | head -1)
279-
# Save the react native version we are building in a file so we can use that file as part of the cache key.
280-
echo "$VERSION" > /tmp/react-native-version
286+
- get_react_native_version
281287
- when:
282288
condition:
283289
equal: [ << parameters.flavor >>, "Debug"]
@@ -322,6 +328,21 @@ commands:
322328
323329
echo "Found Hermes tarball at $TARBALL_PATH"
324330
echo "export HERMES_ENGINE_TARBALL_PATH=$TARBALL_PATH" >> $BASH_ENV
331+
- run:
332+
name: Print Hermes version
333+
command: |
334+
HERMES_TARBALL_ARTIFACTS_DIR=<< parameters.hermes_tarball_artifacts_dir >>
335+
TARBALL_FILENAME=$(node ~/react-native/scripts/hermes/get-tarball-name.js --buildType "<< parameters.flavor >>")
336+
TARBALL_PATH=$HERMES_TARBALL_ARTIFACTS_DIR/$TARBALL_FILENAME
337+
if [[ -e $TARBALL_PATH ]]; then
338+
tar -xf $TARBALL_PATH
339+
echo 'print(HermesInternal?.getRuntimeProperties?.()["OSS Release Version"])' > test.js
340+
./destroot/bin/hermes test.js
341+
rm test.js
342+
rm -rf destroot
343+
else
344+
echo 'No Hermes tarball found.'
345+
fi
325346
- steps: << parameters.steps >>
326347
- when:
327348
condition:
@@ -1211,6 +1232,7 @@ jobs:
12111232
- checkout_code_with_cache
12121233
- run_yarn
12131234
- *attach_hermes_workspace
1235+
- get_react_native_version
12141236
- when:
12151237
condition:
12161238
equal: [ << parameters.flavor >>, "Debug"]

0 commit comments

Comments
 (0)