Skip to content

Commit 7413128

Browse files
WIP add xcbeautify to build scripts
1 parent 4c2bb64 commit 7413128

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

scripts/build.sh

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@ function exportMacOS {
44
local EXPORT_OPTIONS_CATALYST="$1"
55
local BUILD_TYPE="$2"
66

7-
xcodebuild -exportArchive \
7+
NSUnbufferedIO=YES xcodebuild -exportArchive \
88
-archivePath "build/macos_$APP_NAME.xcarchive" \
99
-exportPath "build/app" \
1010
-exportOptionsPlist "$EXPORT_OPTIONS_CATALYST" \
1111
-allowProvisioningUpdates \
12-
-configuration $BUILD_TYPE
12+
-configuration $BUILD_TYPE \
13+
2>&1 | xcbeautify --renderer github-actions
1314

1415
echo "build dir:"
1516
ls -l "build"
@@ -18,6 +19,9 @@ function exportMacOS {
1819
# Abort on Error
1920
set -e
2021

22+
# Needed for xcbeautify
23+
set -o pipefail
24+
2125
cd Monal
2226

2327
security unlock-keychain -p $(cat /Users/ci/keychain.txt) login.keychain
@@ -47,7 +51,7 @@ if [ "$BUILD_SCHEME" != "Quicksy" ]; then
4751
echo "***************************"
4852
echo "* Archiving macOS *"
4953
echo "***************************"
50-
xcrun xcodebuild \
54+
NSUnbufferedIO=YES xcrun xcodebuild \
5155
-workspace "Monal.xcworkspace" \
5256
-scheme "$BUILD_SCHEME" \
5357
-sdk macosx \
@@ -57,7 +61,8 @@ if [ "$BUILD_SCHEME" != "Quicksy" ]; then
5761
-allowProvisioningUpdates \
5862
archive \
5963
BUILD_LIBRARIES_FOR_DISTRIBUTION=YES \
60-
SUPPORTS_MACCATALYST=YES
64+
SUPPORTS_MACCATALYST=YES \
65+
2>&1 | xcbeautify --renderer github-actions
6166

6267
echo ""
6368
echo "****************************"
@@ -97,29 +102,31 @@ echo ""
97102
echo "*************************"
98103
echo "* Archiving iOS *"
99104
echo "*************************"
100-
xcrun xcodebuild \
105+
NSUnbufferedIO=YES xcrun xcodebuild \
101106
-workspace "Monal.xcworkspace" \
102107
-scheme "$BUILD_SCHEME" \
103108
-sdk iphoneos \
104109
-configuration $BUILD_TYPE \
105110
-archivePath "build/ios_$APP_NAME.xcarchive" \
106111
-allowProvisioningUpdates \
107-
archive
112+
archive \
113+
2>&1 | xcbeautify --renderer github-actions
108114

109115
echo ""
110116
echo "*************************"
111117
echo "* Exporting iOS *"
112118
echo "*************************"
113119
# see: https://gist.github.com/cocoaNib/502900f24846eb17bb29
114120
# and: https://forums.developer.apple.com/thread/100065
115-
xcodebuild \
121+
NSUnbufferedIO=YES xcodebuild \
116122
-exportArchive \
117123
-archivePath "build/ios_$APP_NAME.xcarchive" \
118124
-exportPath "build/ipa" \
119125
-exportOptionsPlist $EXPORT_OPTIONS_IOS \
120126
-configuration $BUILD_TYPE \
121127
-allowProvisioningUpdates \
122-
-allowProvisioningDeviceRegistration
128+
-allowProvisioningDeviceRegistration \
129+
2>&1 | xcbeautify --renderer github-actions
123130

124131
echo "build dir:"
125132
find build

scripts/updateLocalization.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
set -e
44

5+
# Needed for xcbeautify
6+
set -o pipefail
7+
58
cd "$(dirname "$0")"
69
cd ../Monal
710

0 commit comments

Comments
 (0)