From 2d54e2ef01ca469078d423ef70010c12de648eb2 Mon Sep 17 00:00:00 2001 From: Lorenzo Sciandra Date: Tue, 19 Jul 2022 14:11:03 +0100 Subject: [PATCH 1/4] change logic to use the hermes tag to set the pod correctly --- sdks/hermes-engine/hermes-engine.podspec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sdks/hermes-engine/hermes-engine.podspec b/sdks/hermes-engine/hermes-engine.podspec index 672b7a048d0361..3a52c11f361a55 100644 --- a/sdks/hermes-engine/hermes-engine.podspec +++ b/sdks/hermes-engine/hermes-engine.podspec @@ -31,8 +31,10 @@ elsif version == '1000.0.0' source[:commit] = `git ls-remote https://github.com/facebook/hermes main | cut -f 1`.strip elsif currentremote.strip.end_with?("facebook/react-native.git") and currentbranch.strip.end_with?("-stable") Pod::UI.puts '[Hermes] Detected that you are on a React Native release branch, building Hermes from source...'.yellow if Object.const_defined?("Pod::UI") + hermestag_file = File.join(__dir__, "..", ".hermesversion") + hermestag = File.read(hermestag_file) source[:git] = git - source[:commit] = `git ls-remote https://github.com/facebook/hermes main | cut -f 1`.strip + source[:commit] = `git ls-remote https://github.com/facebook/hermes #{hermestag} | cut -f 1`.strip else source[:http] = "https://github.com/facebook/react-native/releases/download/v#{version}/hermes-runtime-darwin-v#{version}.tar.gz" end From 61785f9745ffbc30ed8dbb4457c0688bd94287e7 Mon Sep 17 00:00:00 2001 From: Lorenzo Sciandra Date: Tue, 19 Jul 2022 14:25:55 +0100 Subject: [PATCH 2/4] change from :commit to :tag --- sdks/hermes-engine/hermes-engine.podspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdks/hermes-engine/hermes-engine.podspec b/sdks/hermes-engine/hermes-engine.podspec index 3a52c11f361a55..6aaa6b84307eaf 100644 --- a/sdks/hermes-engine/hermes-engine.podspec +++ b/sdks/hermes-engine/hermes-engine.podspec @@ -34,7 +34,8 @@ elsif currentremote.strip.end_with?("facebook/react-native.git") and currentbran hermestag_file = File.join(__dir__, "..", ".hermesversion") hermestag = File.read(hermestag_file) source[:git] = git - source[:commit] = `git ls-remote https://github.com/facebook/hermes #{hermestag} | cut -f 1`.strip + source[:tag] = hermestag.to_s + puts "TAG! #{source [:tag]}" else source[:http] = "https://github.com/facebook/react-native/releases/download/v#{version}/hermes-runtime-darwin-v#{version}.tar.gz" end From 0aa3f8b46774e7851f3d3e2040e8d493552c68f7 Mon Sep 17 00:00:00 2001 From: Lorenzo Sciandra Date: Tue, 19 Jul 2022 14:27:19 +0100 Subject: [PATCH 3/4] cleanup --- sdks/hermes-engine/hermes-engine.podspec | 1 - 1 file changed, 1 deletion(-) diff --git a/sdks/hermes-engine/hermes-engine.podspec b/sdks/hermes-engine/hermes-engine.podspec index 6aaa6b84307eaf..160175685e0923 100644 --- a/sdks/hermes-engine/hermes-engine.podspec +++ b/sdks/hermes-engine/hermes-engine.podspec @@ -35,7 +35,6 @@ elsif currentremote.strip.end_with?("facebook/react-native.git") and currentbran hermestag = File.read(hermestag_file) source[:git] = git source[:tag] = hermestag.to_s - puts "TAG! #{source [:tag]}" else source[:http] = "https://github.com/facebook/react-native/releases/download/v#{version}/hermes-runtime-darwin-v#{version}.tar.gz" end From 8c1bbd00a7a6c483416a3df34b0b6ef07c1b1a72 Mon Sep 17 00:00:00 2001 From: Lorenzo Sciandra Date: Tue, 19 Jul 2022 14:35:17 +0100 Subject: [PATCH 4/4] add strip --- sdks/hermes-engine/hermes-engine.podspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdks/hermes-engine/hermes-engine.podspec b/sdks/hermes-engine/hermes-engine.podspec index 160175685e0923..8d331e096ad2e0 100644 --- a/sdks/hermes-engine/hermes-engine.podspec +++ b/sdks/hermes-engine/hermes-engine.podspec @@ -32,9 +32,9 @@ elsif version == '1000.0.0' elsif currentremote.strip.end_with?("facebook/react-native.git") and currentbranch.strip.end_with?("-stable") Pod::UI.puts '[Hermes] Detected that you are on a React Native release branch, building Hermes from source...'.yellow if Object.const_defined?("Pod::UI") hermestag_file = File.join(__dir__, "..", ".hermesversion") - hermestag = File.read(hermestag_file) + hermestag = File.read(hermestag_file).strip source[:git] = git - source[:tag] = hermestag.to_s + source[:tag] = hermestag else source[:http] = "https://github.com/facebook/react-native/releases/download/v#{version}/hermes-runtime-darwin-v#{version}.tar.gz" end