Skip to content

Commit

Permalink
fix: build hermes from source on PR against stable
Browse files Browse the repository at this point in the history
  • Loading branch information
Riccardo Cipolleschi committed Jul 20, 2022
1 parent d6be1af commit 55ed302
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 16 deletions.
15 changes: 3 additions & 12 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -936,18 +936,9 @@ jobs:
- run:
name: Download Hermes tarball
command: |
node scripts/hermes/prepare-hermes-for-build
# If Hermes is not built from source, we don't have these folders.
DOWNLOAD_FOLDER=sdks/download/
if [[ -d $DOWNLOAD_FOLDER ]]; then
cp $DOWNLOAD_FOLDER* $HERMES_WS_DIR/download/.
fi
HERMES_FOLDER=sdks/hermes/
if [[ -d $HERMES_FOLDER ]]; then
cp -r $HERMES_FOLDER* $HERMES_WS_DIR/hermes/.
fi
node scripts/hermes/prepare-hermes-for-build $CIRCLE_PULL_REQUEST
cp sdks/download/* $HERMES_WS_DIR/download/.
cp -r sdks/hermes/* $HERMES_WS_DIR/hermes/.
- save_cache:
key: v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
paths:
Expand Down
17 changes: 16 additions & 1 deletion scripts/hermes/hermes-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,12 +190,27 @@ function isOnAReleaseTag() {
return currentRemote.endsWith('facebook/react-native.git');
}

function shouldBuildHermesFromSource() {
function isPRAgainstStable(pullRequest) {
if (pullRequest == null) {
return false;
}

const prComponents = pullRequest.split("/");
const prNumber = prComponents[prComponents.length - 1];
const apiURL = `https://api.github.com/repos/facebook/react-native/pulls/${prNumber}`;
const prJson = JSON.parse(execSync(`curl ${apiURL}`).toString())
const baseBranch = prJson["base"]["label"]

return baseBranch.endsWith('-stable');;
}

function shouldBuildHermesFromSource(pullRequest) {
const hermesTag = readHermesTag();

return (
isOnAReleaseBranch() ||
isOnAReleaseTag() ||
isPRAgainstStable(pullRequest) ||
hermesTag === DEFAULT_HERMES_TAG
);
}
Expand Down
8 changes: 5 additions & 3 deletions scripts/hermes/prepare-hermes-for-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ const {
shouldBuildHermesFromSource,
} = require('./hermes-utils');

async function main() {
if (!shouldBuildHermesFromSource()) {
async function main(pullRequest) {
if (!shouldBuildHermesFromSource(pullRequest)) {
copyPodSpec();
return;
}
Expand All @@ -40,6 +40,8 @@ async function main() {
}
}

main().then(() => {
const pullRequest = process.argv.length > 2 ? process.argv[2] : null

main(pullRequest).then(() => {
process.exit(0);
});

0 comments on commit 55ed302

Please sign in to comment.