88 * @format
99 */
1010
11+ const {
12+ findMatchingHermesVersion,
13+ hermesCommitAtMergeBase,
14+ } = require ( './macosVersionResolver' ) ; // [macOS]
1115const { computeNightlyTarballURL, createLogger} = require ( './utils' ) ;
1216const { execSync} = require ( 'child_process' ) ;
1317const fs = require ( 'fs' ) ;
14- const os = require ( 'os' ) ;
18+ const os = require ( 'os' ) ; // [macOS]
1519const path = require ( 'path' ) ;
1620const stream = require ( 'stream' ) ;
1721const { promisify} = require ( 'util' ) ;
@@ -23,124 +27,6 @@ const hermesLog = createLogger('Hermes');
2327import type {BuildFlavor, Destination, Platform} from './types';
2428*/
2529
26- // [macOS
27- /**
28- * For react-native-macos stable branches, maps the macOS package version
29- * to the upstream react-native version using peerDependencies.
30- * Returns null for version 1000.0.0 (main branch dev version).
31- *
32- * This is the JavaScript equivalent of the Ruby `findMatchingHermesVersion`
33- * in sdks/hermes-engine/hermes-utils.rb.
34- */
35- function findMatchingHermesVersion (
36- packageJsonPath /*: string */ ,
37- ) /*: ?string */ {
38- const pkg = JSON . parse ( fs . readFileSync ( packageJsonPath , 'utf8' ) ) ;
39-
40- if ( pkg . version === '1000.0.0' ) {
41- hermesLog (
42- 'Main branch detected (1000.0.0), no matching upstream Hermes version' ,
43- ) ;
44- return null ;
45- }
46-
47- if ( pkg . peerDependencies && pkg . peerDependencies [ 'react-native' ] ) {
48- const upstreamVersion = pkg . peerDependencies [ 'react-native' ] ;
49- hermesLog (
50- `Mapped macOS version ${ pkg . version } ${ upstreamVersion } ,
51- ) ;
52- return upstreamVersion ;
53- }
54-
55- hermesLog (
56- 'No matching Hermes version found in peerDependencies. Defaulting to package version.' ,
57- ) ;
58- return null ;
59- }
60-
61- /**
62- * Finds the Hermes commit at the merge base with facebook/react-native.
63- * Used on the main branch (1000.0.0) where no prebuilt artifacts exist.
64- *
65- * Since react-native-macos lags slightly behind facebook/react-native, we can't always use
66- * the latest Hermes commit because Hermes and JSI don't always guarantee backwards compatibility.
67- * Instead, we take the commit hash of Hermes at the time of the merge base with facebook/react-native.
68- *
69- * This is the JavaScript equivalent of the Ruby `hermes_commit_at_merge_base`
70- * in sdks/hermes-engine/hermes-utils.rb.
71- */
72- function hermesCommitAtMergeBase ( ) /*: {| commit: string, timestamp: string |} */ {
73- const HERMES_GITHUB_URL = 'https://github.com/facebook/hermes.git' ;
74-
75- // Fetch upstream react-native
76- hermesLog ( 'Fetching facebook/react-native to find merge base...' ) ;
77- try {
78- execSync ( 'git fetch -q https://github.com/facebook/react-native.git' , {
79- stdio : 'pipe' ,
80- } ) ;
81- } catch ( e ) {
82- abort (
83- '[Hermes] Failed to fetch facebook/react-native into the local repository.' ,
84- ) ;
85- }
86-
87- // Find merge base between our HEAD and upstream's HEAD
88- const mergeBase = execSync ( 'git merge-base FETCH_HEAD HEAD' , {
89- encoding : 'utf8' ,
90- } ) . trim ( ) ;
91- if ( ! mergeBase ) {
92- abort (
93- "[Hermes] Unable to find the merge base between our HEAD and upstream's HEAD." ,
94- ) ;
95- }
96-
97- // Get timestamp of merge base
98- const timestamp = execSync ( `git show -s --format=%ci ${ mergeBase } , {
99- encoding : 'utf8' ,
100- } ) . trim ( ) ;
101- if ( ! timestamp ) {
102- abort (
103- `[Hermes] Unable to extract the timestamp for the merge base (${ mergeBase } ,
104- ) ;
105- }
106-
107- // Clone Hermes bare (minimal) into a temp directory and find the commit
108- hermesLog (
109- `Merge base timestamp: ${ timestamp } ,
110- ) ;
111- const tmpDir = fs . mkdtempSync ( path . join ( os . tmpdir ( ) , 'hermes-' ) ) ;
112- const hermesGitDir = path . join ( tmpDir , 'hermes.git' ) ;
113-
114- try {
115- // Explicitly use Hermes 'main' branch since the default branch changed to 'static_h' (Hermes V1)
116- execSync (
117- `git clone -q --bare --filter=blob:none --single-branch --branch main ${ HERMES_GITHUB_URL } ${ hermesGitDir } ,
118- { stdio : 'pipe' , timeout : 120000 } ,
119- ) ;
120-
121- // Find the Hermes commit at the time of the merge base on branch 'main'
122- const commit = execSync (
123- `git --git-dir="${ hermesGitDir } ${ timestamp } ,
124- { encoding : 'utf8' } ,
125- ) . trim ( ) ;
126-
127- if ( ! commit ) {
128- abort (
129- `[Hermes] Unable to find the Hermes commit hash at time ${ timestamp } ,
130- ) ;
131- }
132-
133- hermesLog (
134- `Using Hermes commit from the merge base with facebook/react-native: ${ commit } ${ timestamp } ,
135- ) ;
136- return { commit, timestamp} ;
137- } finally {
138- // Clean up temp directory
139- fs . rmSync ( tmpDir , { recursive : true , force : true } ) ;
140- }
141- }
142- // macOS]
143-
14430/**
14531 * Downloads hermes artifacts from the specified version and build type. If you want to specify a specific
14632 * version of hermes, use the HERMES_VERSION environment variable. The path to the artifacts will be inside
@@ -556,23 +442,19 @@ async function buildFromHermesCommit(
556442 const hermesDir = path . join ( tmpDir , 'hermes' ) ;
557443
558444 try {
559- // Clone Hermes at the identified commit
445+ // Clone Hermes at the identified commit using the most efficient
446+ // single-fetch pattern (see https://github.com/actions/checkout)
560447 hermesLog ( `Cloning Hermes at commit ${ commit } ) ;
561- execSync ( `git clone --depth 1 ${ HERMES_GITHUB_URL } ${ hermesDir } , {
562- stdio : 'inherit' ,
563- timeout : 300000 ,
564- } ) ;
565- execSync ( `git -C "${ hermesDir } ${ commit } , {
566- stdio : 'inherit' ,
567- timeout : 120000 ,
568- } ) ;
569- execSync ( `git -C "${ hermesDir } ${ commit } , {
448+ execSync ( `git init "${ hermesDir } , { stdio : 'inherit' } ) ;
449+ execSync ( `git -C "${ hermesDir } ${ HERMES_GITHUB_URL } , {
570450 stdio : 'inherit' ,
571451 } ) ;
452+ execSync (
453+ `git -C "${ hermesDir } ${ commit } ,
454+ { stdio : 'inherit' , timeout : 300000 } ,
455+ ) ;
456+ execSync ( `git -C "${ hermesDir } , { stdio : 'inherit' } ) ;
572457
573- // The build-ios-framework.sh script runs from the hermes directory.
574- // It sources build-apple-framework.sh which sets HERMES_PATH relative to itself,
575- // but we override it to point to the cloned Hermes repo.
576458 const reactNativeRoot = path . resolve ( __dirname , '..' , '..' ) ;
577459 const buildScript = path . join (
578460 reactNativeRoot ,
@@ -582,23 +464,25 @@ async function buildFromHermesCommit(
582464 'build-ios-framework.sh' ,
583465 ) ;
584466
467+ const buildEnv = {
468+ ...process . env ,
469+ BUILD_TYPE : buildType ,
470+ HERMES_PATH : hermesDir ,
471+ JSI_PATH : path . join ( hermesDir , 'API' , 'jsi' ) ,
472+ REACT_NATIVE_PATH : reactNativeRoot ,
473+ // Deployment targets matching react-native-macos minimums
474+ IOS_DEPLOYMENT_TARGET : '15.1' ,
475+ MAC_DEPLOYMENT_TARGET : '14.0' ,
476+ XROS_DEPLOYMENT_TARGET : '1.0' ,
477+ RELEASE_VERSION : version ,
478+ } ;
479+
585480 hermesLog ( `Building Hermes frameworks (${ buildType } ) ;
586481 execSync ( `bash "${ buildScript } , {
587482 cwd : hermesDir ,
588483 stdio : 'inherit' ,
589484 timeout : 3600000 , // 60 minutes
590- env : {
591- ...process . env ,
592- BUILD_TYPE : buildType ,
593- HERMES_PATH : hermesDir ,
594- JSI_PATH : path . join ( hermesDir , 'API' , 'jsi' ) ,
595- REACT_NATIVE_PATH : reactNativeRoot ,
596- // Deployment targets matching react-native-macos minimums
597- IOS_DEPLOYMENT_TARGET : '15.1' ,
598- MAC_DEPLOYMENT_TARGET : '14.0' ,
599- XROS_DEPLOYMENT_TARGET : '1.0' ,
600- RELEASE_VERSION : version ,
601- } ,
485+ env : buildEnv ,
602486 } ) ;
603487
604488 // Create tarball from the destroot (same structure as Maven artifacts)
@@ -651,6 +535,6 @@ function abort(message /*: string */) {
651535
652536module . exports = {
653537 prepareHermesArtifactsAsync,
654- findMatchingHermesVersion, // [macOS]
655- hermesCommitAtMergeBase, // [macOS]
538+ findMatchingHermesVersion, // [macOS] re-exported from macosVersionResolver.js
539+ hermesCommitAtMergeBase, // [macOS] re-exported from macosVersionResolver.js
656540} ;
0 commit comments