Skip to content

Commit d7921f0

Browse files
hramosfacebook-github-bot
authored andcommitted
Hermes: Use prepare-hermes-for-build in Circle CI (#33811)
Summary: Pull Request resolved: #33811 Use `scripts/hermes/prepare-hermes-for-build.js` in Circle CI, eliminating redundant steps in the `prepare_hermes_workspace` Circle CI job. Changelog: [Internal] Reviewed By: cipolleschi Differential Revision: D36335122 fbshipit-source-id: b7e8c7aeb2aac5afaf37677cd3ac949ac3f96de1
1 parent aaa01f7 commit d7921f0

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

.circleci/config.yml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -911,8 +911,12 @@ jobs:
911911
name: Install dependencies
912912
command: |
913913
apt update
914-
apt install -y wget git
914+
apt install -y wget git curl
915+
curl -sL https://deb.nodesource.com/setup_16.x | bash -
916+
apt install -y nodejs
917+
npm install --global yarn
915918
- checkout
919+
- run_yarn
916920
- run:
917921
name: Set up Hermes workspace and caching
918922
command: |
@@ -929,24 +933,9 @@ jobs:
929933
- run:
930934
name: Download Hermes tarball
931935
command: |
932-
HERMES_TARBALL_URL="https://github.com/facebook/hermes/archive/refs/heads/main.tar.gz"
933-
HERMES_TARBALL_PATH="$HERMES_WS_DIR/download/hermes.tar.gz"
934-
935-
if [ -f "$HERMES_VERSION_FILE" ]; then
936-
HERMES_TAG=$(cat $HERMES_VERSION_FILE | tr -d '[:space:]')
937-
HERMES_TARBALL_URL="https://github.com/facebook/hermes/archive/refs/tags/$HERMES_TAG.tar.gz"
938-
echo "Using Hermes version tagged $HERMES_TAG"
939-
else
940-
echo "Using Hermes latest version from trunk"
941-
fi
942-
943-
if [ -f "$HERMES_TARBALL_PATH" ]; then
944-
echo "Skipping download; $HERMES_TARBALL_PATH already present."
945-
else
946-
echo "Downloading Hermes tarball from $HERMES_TARBALL_URL"
947-
wget -O "$HERMES_TARBALL_PATH" "$HERMES_TARBALL_URL"
948-
fi
949-
tar -xzf "$HERMES_WS_DIR/download/hermes.tar.gz" --strip-components=1 -C "$HERMES_WS_DIR/hermes"
936+
node scripts/hermes/prepare-hermes-for-build
937+
cp sdks/download/* $HERMES_WS_DIR/download/.
938+
cp -r sdks/hermes/* $HERMES_WS_DIR/hermes/.
950939
- save_cache:
951940
key: *hermes_cache_key
952941
paths:

sdks/hermes-engine/utils/build-apple-framework.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ function create_universal_framework {
9090
done
9191

9292
mkdir universal
93-
xcodebuild -create-xcframework "$args" -output "universal/hermes.xcframework"
93+
# shellcheck disable=SC2086
94+
xcodebuild -create-xcframework $args -output "universal/hermes.xcframework"
9495

9596
for platform in "$@"; do
9697
rm -r "$platform"

0 commit comments

Comments
 (0)