diff --git a/.circleci/configurations/executors.yml b/.circleci/configurations/executors.yml index f06f0497773e35..5ffb38877eddc1 100644 --- a/.circleci/configurations/executors.yml +++ b/.circleci/configurations/executors.yml @@ -39,7 +39,7 @@ executors: reactnativeios-lts: <<: *defaults macos: - xcode: '14.3.1' + xcode: '15.1' resource_class: macos.m1.medium.gen1 environment: - RCT_BUILD_HERMES_FROM_SOURCE: true diff --git a/.circleci/configurations/jobs.yml b/.circleci/configurations/jobs.yml index 942d8396885021..4491cbdf0a8b67 100644 --- a/.circleci/configurations/jobs.yml +++ b/.circleci/configurations/jobs.yml @@ -786,9 +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" - - XROS_DEPLOYMENT_TARGET: "1.0" - - MACOSX_DEPLOYMENT_TARGET: "10.15" steps: - *attach_hermes_workspace - stop_job_if_apple_artifacts_are_there: @@ -824,6 +821,23 @@ jobs: echo "[HERMES] Building Hermes for iOS: $SLICE" BUILD_TYPE="<< parameters.flavor >>" ./utils/build-ios-framework.sh "$SLICE" fi + + if [[ "$SLICE" == "macosx" ]]; then + export MACOSX_DEPLOYMENT_TARGET="10.15" + echo "[HERMES] Building Hermes for MacOS" + BUILD_TYPE="<< parameters.flavor >>" ./utils/build-mac-framework.sh + unset MACOSX_DEPLOYMENT_TARGET + elif [[ "$SLICE" == "xros" ]] || [[ "$SLICE" == "xrsimulator" ]]; then + export XROS_DEPLOYMENT_TARGET="1.0" + echo "[HERMES] Building Hermes for XR: $SLICE" + BUILD_TYPE="<< parameters.flavor >>" ./utils/build-ios-framework.sh "$SLICE" + unset XROS_DEPLOYMENT_TARGET + elif [[ "$SLICE" == "iphoneos" ]] || [[ "$SLICE" == "iphonesimulator" ]] || [[ "$SLICE" == "catalyst" ]] ; then + export IOS_DEPLOYMENT_TARGET="13.4" + echo "[HERMES] Building Hermes for iOS: $SLICE" + BUILD_TYPE="<< parameters.flavor >>" ./utils/build-ios-framework.sh "$SLICE" + unset IOS_DEPLOYMENT_TARGET + fi unset RELEASE_VERSION echo "Moving from build_$SLICE to $FINAL_PATH" @@ -1131,6 +1145,11 @@ jobs: - run: name: Creating release commit command: | + # I'm seeing failures in automatically detect the email for the + # agent that should push the commit. + git config --global user.name "Distiller" + git config --global user.email "distiller@circleci.com" + git commit -a -m "Release << parameters.version >>" -m "#publish-packages-to-npm&<< parameters.tag >>" git tag -a "v<< parameters.version >>" -m "v<< parameters.version >>" env GIT_PAGER=cat git show HEAD diff --git a/.circleci/configurations/top_level.yml b/.circleci/configurations/top_level.yml index 4ff9d802e8fa19..914870327c5427 100644 --- a/.circleci/configurations/top_level.yml +++ b/.circleci/configurations/top_level.yml @@ -59,7 +59,7 @@ references: # Dependency Anchors # ------------------------- dependency_versions: - xcode_version: &xcode_version "15.0.1" + xcode_version: &xcode_version "15.2" nodelts_image: &nodelts_image "cimg/node:20.2.0" nodeprevlts_image: &nodeprevlts_image "cimg/node:18.12.1" nodelts_browser_image: &nodelts_browser_image "cimg/node:20.2.0-browsers"