Skip to content

Increase CI script portability around xcbeautify #634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kieran-osgood-shopify wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Increase CI script portability around xcbeautify #634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions e2e/bitrise.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,11 @@ trigger_map:

pipelines:
e2e:
# Bitrise's default report name is ci/bitrise/<project_slug>/<event_type>,
# which is identical for every pipeline on this app. A second triggered
# pipeline would then overwrite this one's commit status. <target_id>
# expands to the pipeline id, so each pipeline owns its own check.
status_report_name: "ci/bitrise/<target_id>/<event_type>"
workflows:
e2e-produce-browserstack-run-plan: {}
e2e-build-react-native-ios:
Expand Down Expand Up @@ -451,6 +456,7 @@ workflows:
- script@1:
title: Decide whether the nightly build runs
timeout: 300
no_output_timeout: 150

@kieran-osgood-shopify kieran-osgood-shopify Aug 13, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated but this is just a straight forwards improvement for this script

inputs:
- content: |-
set -euo pipefail
Expand Down
31 changes: 19 additions & 12 deletions platforms/react-native/sample/scripts/build_ios
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,25 @@ dest="$(get_sim_destination)"
cd ios

xcbeautify_args=""
if [ "$CI" = "true" ]; then
if [ "${GITHUB_ACTIONS:-}" = "true" ]; then
xcbeautify_args="--renderer github-actions"
fi

xcodebuild clean build \
-workspace CheckoutKitReactNativeDemo.xcworkspace \
-scheme CheckoutKitReactNativeDemo \
-sdk iphonesimulator \
-destination "$dest" \
-skipPackagePluginValidation \
-disableAutomaticPackageResolution \
GCC_PRECOMPILE_PREFIX_HEADER=YES \
ASSETCATALOG_COMPILER_OPTIMIZATION=time \
COMPILER_INDEX_STORE_ENABLE=NO \
| xcbeautify $xcbeautify_args
run_xcodebuild() {
xcodebuild clean build \
-workspace CheckoutKitReactNativeDemo.xcworkspace \
-scheme CheckoutKitReactNativeDemo \
-sdk iphonesimulator \
-destination "$dest" \
-skipPackagePluginValidation \
-disableAutomaticPackageResolution \
GCC_PRECOMPILE_PREFIX_HEADER=YES \
ASSETCATALOG_COMPILER_OPTIMIZATION=time \
COMPILER_INDEX_STORE_ENABLE=NO
}

if command -v xcbeautify >/dev/null 2>&1; then
run_xcodebuild | xcbeautify $xcbeautify_args
else
run_xcodebuild
fi
29 changes: 18 additions & 11 deletions platforms/react-native/sample/scripts/test_ios
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,24 @@ else
fi

xcbeautify_args=""
if [ "$CI" = "true" ]; then
if [ "${GITHUB_ACTIONS:-}" = "true" ]; then
xcbeautify_args="--renderer github-actions"
fi

xcodebuild test \
-workspace RCTIntegrationApp.xcworkspace \
-scheme RCTIntegrationApp \
-destination "$dest" \
-skipPackagePluginValidation \
-disableAutomaticPackageResolution \
-sdk iphonesimulator \
ASSETCATALOG_COMPILER_OPTIMIZATION=time \
COMPILER_INDEX_STORE_ENABLE=NO \
| xcbeautify $xcbeautify_args
run_xcodebuild() {
xcodebuild test \
-workspace RCTIntegrationApp.xcworkspace \
-scheme RCTIntegrationApp \
-destination "$dest" \
-skipPackagePluginValidation \
-disableAutomaticPackageResolution \
-sdk iphonesimulator \
ASSETCATALOG_COMPILER_OPTIMIZATION=time \
COMPILER_INDEX_STORE_ENABLE=NO
}

if command -v xcbeautify >/dev/null 2>&1; then
run_xcodebuild | xcbeautify $xcbeautify_args
else
run_xcodebuild
fi
7 changes: 6 additions & 1 deletion platforms/swift/Scripts/api
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,14 @@ build_for_digester() {
SWIFT_TREAT_WARNINGS_AS_ERRORS=YES
)

local xcbeautify_args=""
if [ "${GITHUB_ACTIONS:-}" = "true" ]; then
xcbeautify_args="--renderer github-actions"
fi

cd "$PACKAGE_ROOT"
if command -v xcbeautify >/dev/null 2>&1; then
"${cmd[@]}" | xcbeautify --renderer github-actions
"${cmd[@]}" | xcbeautify $xcbeautify_args
else
"${cmd[@]}"
fi
Expand Down
2 changes: 1 addition & 1 deletion platforms/swift/Scripts/xcode_run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ fi

if command -v xcbeautify >/dev/null 2>&1; then
xcbeautify_args=""
if [ "$CI" = "true" ]; then
if [ "${GITHUB_ACTIONS:-}" = "true" ]; then
xcbeautify_args="--renderer github-actions"
fi
eval "$xcodebuild_cmd" | xcbeautify $xcbeautify_args
Expand Down
Loading