Skip to content

Commit 12381e2

Browse files
authored
Merge pull request #43246 from facebook/fix-hermes-bfs-073
[RN][iOS]Rename BUILD_FROM_SOURCE to RCT_BUILD_HERMES_FROM_SOURCE
2 parents d979491 + 51b8047 commit 12381e2

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.circleci/configurations/executors.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ executors:
3535
xcode: *xcode_version
3636
resource_class: macos.x86.medium.gen2
3737
environment:
38-
- BUILD_FROM_SOURCE: true
38+
- RCT_BUILD_HERMES_FROM_SOURCE: true

.circleci/configurations/jobs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,7 @@ jobs:
673673
environment:
674674
- HERMES_WS_DIR: *hermes_workspace_root
675675
- HERMES_VERSION_FILE: "packages/react-native/sdks/.hermesversion"
676-
- BUILD_FROM_SOURCE: true
676+
- RCT_BUILD_HERMES_FROM_SOURCE: true
677677
steps:
678678
- run:
679679
name: Install dependencies

packages/react-native/sdks/hermes-engine/hermes-utils.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
require 'rexml/document'
88

99
HERMES_GITHUB_URL = "https://github.com/facebook/hermes.git"
10+
ENV_BUILD_FROM_SOURCE = "RCT_BUILD_HERMES_FROM_SOURCE"
1011

1112
module HermesEngineSourceType
1213
LOCAL_PREBUILT_TARBALL = :local_prebuilt_tarball
@@ -30,7 +31,7 @@ def HermesEngineSourceType.isFromSource(source_type)
3031
# - To use a specific tarball, install the dependencies with:
3132
# `HERMES_ENGINE_TARBALL_PATH=<path_to_tarball> bundle exec pod install`
3233
# - To force a build from source, install the dependencies with:
33-
# `BUILD_FROM_SOURCE=true bundle exec pod install`
34+
# `RCT_BUILD_HERMES_FROM_SOURCE=true bundle exec pod install`
3435
# If none of the two are provided, Cocoapods will check whether there is a tarball for the current version
3536
# (either release or nightly). If not, it will fall back to building from source (the latest commit on main).
3637
#
@@ -85,11 +86,11 @@ def hermes_commit_envvar_defined()
8586
end
8687

8788
def force_build_from_tag(react_native_path)
88-
return ENV['BUILD_FROM_SOURCE'] === 'true' && File.exist?(hermestag_file(react_native_path))
89+
return ENV[ENV_BUILD_FROM_SOURCE] === 'true' && File.exist?(hermestag_file(react_native_path))
8990
end
9091

9192
def force_build_from_main(react_native_path)
92-
return ENV['BUILD_FROM_SOURCE'] === 'true' && !File.exist?(hermestag_file(react_native_path))
93+
return ENV[ENV_BUILD_FROM_SOURCE] === 'true' && !File.exist?(hermestag_file(react_native_path))
9394
end
9495

9596
def release_artifact_exists(version)

0 commit comments

Comments
 (0)