From 268da58bcb7d77c7b127e3de25a07b9052ed7e7d Mon Sep 17 00:00:00 2001 From: Shai Mishali Date: Sun, 21 Apr 2024 00:07:31 +0300 Subject: [PATCH] beautify --- CONTRIBUTING.md | 4 ++-- scripts/common.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index df4147fce..cac4a46e9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,9 +15,9 @@ All contributions are handled via Pull Requests (PRs). Your PR _must_ target the Before submitting a pull request please make sure **`./scripts/all-tests.sh`** is passing (exits with 0), otherwise we won't be able to pull your code. -To be able to run `./scripts/all-tests.sh`, you'll need to install [xcpretty](https://github.com/supermarin/xcpretty). +To be able to run `./scripts/all-tests.sh`, you'll need to install [xcbeautify](https://github.com/cpisciotta/xcbeautify). -`sudo gem install xcpretty` +`brew install xcbeautify` Once the tests pass, you can push your feature branch to your clone of the repository, then open a pull request. There are some best practices that will be followed during the development of this project for common good ([Gitflow](http://nvie.com/posts/a-successful-git-branching-model/) branching model). diff --git a/scripts/common.sh b/scripts/common.sh index 3f412b34f..429375841 100755 --- a/scripts/common.sh +++ b/scripts/common.sh @@ -166,7 +166,7 @@ function action() { -configuration "${CONFIGURATION}" \ -derivedDataPath "${BUILD_DIRECTORY}" \ -destination "$DESTINATION" \ - $ACTION | tee build/last-build-output.txt | xcpretty -c + $ACTION | tee build/last-build-output.txt | xcbeautify exitIfLastStatusWasUnsuccessful set +x }