Skip to content

Commit

Permalink
chore: re-add fixes from Kudo's PR 34846 (#34861)
Browse files Browse the repository at this point in the history
Summary:
I'm not sure why, but my commit 97f5ef0 landed despite the PR still having a couple of merge conflicts from after Kudo's PR #34846 being merged.

What happened is that basically it just "overwrote" those chances, so this PR is just a fix for that.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://reactnative.dev/contributing/changelogs-in-pull-requests
-->

[Internal] [Changed] - re-adding Kudo's fix for nightly build

Pull Request resolved: #34861

Test Plan: N/A

Reviewed By: cipolleschi

Differential Revision: D40059290

Pulled By: cortinico

fbshipit-source-id: 38e495a0dbecd39e836d15aa2a1a30e7354d9813
  • Loading branch information
kelset authored and facebook-github-bot committed Oct 4, 2022
1 parent 232e447 commit 8486b4c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
5 changes: 1 addition & 4 deletions scripts/release-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
'use strict';

const {exec, echo, exit, test, env} = require('shelljs');
const {revertFiles, saveFiles} = require('./scm-utils');
const {saveFiles} = require('./scm-utils');

function saveFilesToRestore(tmpPublishingFolder) {
const filesToSaveAndRestore = [
Expand Down Expand Up @@ -46,9 +46,6 @@ function generateAndroidArtifacts(releaseVersion, tmpPublishingFolder) {
exit(1);
}

// undo uncommenting javadoc setting
revertFiles(['ReactAndroid/gradle.properties'], tmpPublishingFolder);

echo('Generated artifacts for Maven');

let artifacts = [
Expand Down
2 changes: 1 addition & 1 deletion sdks/hermes-engine/hermes-engine.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ git = "https://github.com/facebook/hermes.git"
if ENV.has_key?('HERMES_ENGINE_TARBALL_PATH')
Pod::UI.puts '[Hermes] Using pre-built Hermes binaries from local path.' if Object.const_defined?("Pod::UI")
source[:http] = "file://#{ENV['HERMES_ENGINE_TARBALL_PATH']}"
elsif version.include? '1000.0.0'
elsif version.include? '1000.0.0' || version.start_with?('0.0.0-')
Pod::UI.puts '[Hermes] Installing hermes-engine may take a while, building Hermes from source...'.yellow if Object.const_defined?("Pod::UI")
source[:git] = git
source[:commit] = `git ls-remote https://github.com/facebook/hermes main | cut -f 1`.strip
Expand Down

0 comments on commit 8486b4c

Please sign in to comment.