From 7cffe74d2950ca330c786076e9a6eb64a14162fa Mon Sep 17 00:00:00 2001 From: Riccardo Cipolleschi Date: Tue, 30 May 2023 02:57:49 -0700 Subject: [PATCH] Backporting a fix for hermesc on linux (#37596) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/37596 This commit is a backport of this [commit](https://github.com/facebook/react-native/commit/32327cc17779659bc441580d44784a60a74ede32) so that we build the right version of hermes in CI. This also bumps the hermes keys to make sure that we are building it properly from now on. ## Changelog: [Internal] - Fix Hermes versioning and bump hermes workspace keys Reviewed By: cortinico Differential Revision: D46225179 fbshipit-source-id: a62fda7f417f69aee7fb8e1d812b02fda694f534 --- .circleci/config.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6ce5e9728483..8babd32c1d91 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -59,7 +59,7 @@ references: checkout_cache_key: &checkout_cache_key v1-checkout gems_cache_key: &gems_cache_key v1-gems-{{ checksum "Gemfile.lock" }} gradle_cache_key: &gradle_cache_key v1-gradle-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}-{{ checksum "packages/react-native/ReactAndroid/gradle.properties" }} - hermes_workspace_cache_key: &hermes_workspace_cache_key v4-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }} + hermes_workspace_cache_key: &hermes_workspace_cache_key v5-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_linux_cache_key: &hermes_linux_cache_key v1-hermes-{{ .Environment.CIRCLE_JOB }}-linux-{{ checksum "/tmp/hermes/hermesversion" }}-{{ checksum "/tmp/react-native-version" }} @@ -1109,7 +1109,7 @@ jobs: - image: debian:11 environment: - HERMES_WS_DIR: *hermes_workspace_root - - HERMES_VERSION_FILE: "sdks/.hermesversion" + - HERMES_VERSION_FILE: "packages/react-native/sdks/.hermesversion" - BUILD_FROM_SOURCE: true steps: - run: @@ -1128,8 +1128,11 @@ jobs: mkdir -p "/tmp/hermes" "/tmp/hermes/download" "/tmp/hermes/hermes" if [ -f "$HERMES_VERSION_FILE" ]; then + echo "Hermes Version file found! Using this version for the build:" cat $HERMES_VERSION_FILE > /tmp/hermes/hermesversion else + echo "Hermes Version file not found!!!" + echo "Using the last commit from main for the build:" HERMES_TAG_SHA=$(git ls-remote https://github.com/facebook/hermes main | cut -f 1 | tr -d '[:space:]') echo $HERMES_TAG_SHA > /tmp/hermes/hermesversion fi