Skip to content

Commit

Permalink
Move IOS_DEPLOYMENT_TARGET and MAC_DEPLOYMENT_TARGET to the command b…
Browse files Browse the repository at this point in the history
…ody (facebook#43695)

Summary:

This diff moves IOS_DEPLOYMENT_TARGET and MAC_DEPLOYMENT_TARGET definitions to the command body. It also adds `set -x` to `build-apple-framework.sh` for simpler diagnostics.
Changelog: [Internal]

Differential Revision: D55478563
  • Loading branch information
dmytrorykun authored and facebook-github-bot committed Mar 28, 2024
1 parent 66634be commit 4f5a9e5
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .circleci/configurations/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -786,8 +786,6 @@ jobs:
- HERMES_WS_DIR: *hermes_workspace_root
- HERMES_TARBALL_ARTIFACTS_DIR: *hermes_tarball_artifacts_dir
- HERMES_OSXBIN_ARTIFACTS_DIR: *hermes_osxbin_artifacts_dir
- IOS_DEPLOYMENT_TARGET: 13.4
- MAC_DEPLOYMENT_TARGET: 10.13
steps:
- *attach_hermes_workspace
- stop_job_if_apple_artifacts_are_there:
Expand All @@ -808,6 +806,8 @@ jobs:
SLICE=<< parameters.slice >>
FLAVOR=<< parameters.flavor >>
FINAL_PATH=build_"$SLICE"_"$FLAVOR"
IOS_DEPLOYMENT_TARGET=13.4
MAC_DEPLOYMENT_TARGET=10.13
echo "Final path for this slice is: $FINAL_PATH"
if [[ -d "$FINAL_PATH" ]]; then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
# Defines functions for building various Hermes frameworks.
# See build-ios-framework.sh and build-mac-framework.sh for usage examples.

set -x

CURR_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"

IMPORT_HERMESC_PATH=${HERMES_OVERRIDE_HERMESC_PATH:-$PWD/build_host_hermesc/ImportHermesc.cmake}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

set -x

# Given a specific target, retrieve the right architecture for it
# $1 the target you want to build. Allowed values: iphoneos, iphonesimulator, catalyst
function get_architecture {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
# This source code is licensed under the MIT license found in the
# LICENSE file in the root directory of this source tree.

set -x

# shellcheck source=xplat/js/react-native-github/sdks/hermes-engine/utils/build-apple-framework.sh
CURR_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
. "${CURR_SCRIPT_DIR}/build-apple-framework.sh"
Expand Down

0 comments on commit 4f5a9e5

Please sign in to comment.