Skip to content
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

Jump to bottom

[Infra] Replace xcpretty with xcbeautify in build.sh #13983

Merged
merged 8 commits into from
Oct 30, 2024
Merged

[Infra] Replace xcpretty with xcbeautify in build.sh #13983

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0da1d7e
[Vertex AI] Add `VertexAITestApp-SPM.xcscheme`
andrewheard Oct 28, 2024
048ed6b
Revert "[Vertex AI] Add `VertexAITestApp-SPM.xcscheme`"
andrewheard Oct 29, 2024
465bad2
Replace `xcpretty` with `xcbeautify`
andrewheard Oct 29, 2024
50a65a3
Touch Vertex AI test file to trigger tests
andrewheard Oct 29, 2024
1987f05
Add intentionally failing test to try xcbeautify GHA renderer
andrewheard Oct 29, 2024
3a7a4c2
Revert "Add intentionally failing test to try xcbeautify GHA renderer"
andrewheard Oct 29, 2024
d94b926
Merge remote-tracking branch 'origin/main' into ah/vertex-testapp-scheme
andrewheard Oct 29, 2024
ad1df7c
Remove TODO
andrewheard Oct 29, 2024
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
8 changes: 4 additions & 4 deletions scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,15 @@ esac
# Source function to check if CI secrets are available.
source scripts/check_secrets.sh

# Runs xcodebuild with the given flags, piping output to xcpretty
# Runs xcodebuild with the given flags, piping output to xcbeautify
# If xcodebuild fails with known error codes, retries once.
function RunXcodebuild() {
echo xcodebuild "$@"

xcpretty_cmd=(xcpretty)
xcbeautify_cmd=(xcbeautify --renderer github-actions)

result=0
xcodebuild "$@" | tee xcodebuild.log | "${xcpretty_cmd[@]}" || result=$?
xcodebuild "$@" | tee xcodebuild.log | "${xcbeautify_cmd[@]}" || result=$?

if [[ $result == 65 ]]; then
ExportLogs "$@"
Expand All @@ -122,7 +122,7 @@ function RunXcodebuild() {
sleep 5

result=0
xcodebuild "$@" | tee xcodebuild.log | "${xcpretty_cmd[@]}" || result=$?
xcodebuild "$@" | tee xcodebuild.log | "${xcbeautify_cmd[@]}" || result=$?
fi

if [[ $result != 0 ]]; then
Expand Down
Loading