Skip to content

Commit b0f1c05

Browse files
Saadnajmiclaude
andcommitted
fix: route macosx through build-ios-framework.sh and simplify get_architecture
Address review feedback: - Remove macosx conditional in CI — all slices now go through build-ios-framework.sh since it handles macosx - Simplify get_architecture from 5 branches to 2 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 1f117d9 commit b0f1c05

2 files changed

Lines changed: 4 additions & 19 deletions

File tree

.github/workflows/build-apple-slices-hermes.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,8 @@ jobs:
5555
# HermesC is used to build hermes, so it has to be executable
5656
chmod +x ./build_host_hermesc/bin/hermesc
5757
58-
if [[ "$SLICE" == "macosx" ]]; then
59-
echo "[HERMES] Building Hermes for MacOS"
60-
61-
chmod +x ./utils/build-mac-framework.sh
62-
BUILD_TYPE="${{ matrix.flavor }}" ./utils/build-mac-framework.sh
63-
else
64-
echo "[HERMES] Building Hermes for iOS: $SLICE"
65-
66-
chmod +x ./utils/build-ios-framework.sh
67-
BUILD_TYPE="${{ matrix.flavor }}" ./utils/build-ios-framework.sh "$SLICE"
68-
fi
58+
chmod +x ./utils/build-ios-framework.sh
59+
BUILD_TYPE="${{ matrix.flavor }}" ./utils/build-ios-framework.sh "$SLICE"
6960
7061
echo "Moving from build_$SLICE to $FINAL_PATH"
7162
mv build_"$SLICE" "$FINAL_PATH"

utils/build-ios-framework.sh

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,9 @@ set -e
1212
# Given a specific target, retrieve the right architecture for it
1313
# $1 the target you want to build. Allowed values: iphoneos, iphonesimulator, catalyst, xros, xrsimulator
1414
function get_architecture {
15-
if [[ $1 == "iphoneos" || $1 == "xros" ]]; then
15+
if [[ $1 == "iphoneos" || $1 == "appletvos" || $1 == "xros" ]]; then
1616
echo "arm64"
17-
elif [[ $1 == "iphonesimulator" || $1 == "xrsimulator" ]]; then
18-
echo "x86_64;arm64"
19-
elif [[ $1 == "appletvos" ]]; then
20-
echo "arm64"
21-
elif [[ $1 == "appletvsimulator" ]]; then
22-
echo "x86_64;arm64"
23-
elif [[ $1 == "catalyst" || $1 == "macosx" ]]; then
17+
elif [[ $1 == "iphonesimulator" || $1 == "appletvsimulator" || $1 == "catalyst" || $1 == "macosx" || $1 == "xrsimulator" ]]; then
2418
echo "x86_64;arm64"
2519
else
2620
echo "Error: unknown architecture passed $1"

0 commit comments

Comments
 (0)