Skip to content

Commit 7d87704

Browse files
lucdionlucdion
committed
Add &&
1 parent 9b71061 commit 7d87704

File tree

1 file changed

+65
-65
lines changed

1 file changed

+65
-65
lines changed

‎build-ci.sh‎

Lines changed: 65 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -12,61 +12,61 @@ abort()
1212
exit 1
1313
}
1414

15-
trap 'abort' 0
16-
set -e
15+
trap 'abort' 0 &&
16+
set -e &&
1717

18-
set -o pipefail
19-
rm -rf $DERIVED_DATA
18+
set -o pipefail &&
19+
rm -rf $DERIVED_DATA &&
2020

21-
echo "==============================="
22-
echo "PinLayout-iOS"
23-
echo "==============================="
21+
echo "===============================" &&
22+
echo "PinLayout-iOS" &&
23+
echo "===============================" &&
2424
time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-iOS \
2525
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.0 \
2626
-destination 'platform=iOS Simulator,name=iPhone 8,OS=13.0' \
27-
| xcpretty
27+
| xcpretty &&
2828

29-
echo "==============================="
30-
echo "PinLayout-tvOS"
31-
echo "==============================="
29+
echo "===============================" &&
30+
echo "PinLayout-tvOS" &&
31+
echo "===============================" &&
3232
time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-tvOS \
3333
-derivedDataPath $DERIVED_DATA -sdk appletvsimulator13.0 \
3434
-destination 'platform=tvOS Simulator,name=Apple TV 4K,OS=13.0' \
35-
| xcpretty
35+
| xcpretty &&
3636

37-
echo "==============================="
38-
echo "PinLayout-macOS"
39-
echo "==============================="
37+
echo "===============================" &&
38+
echo "PinLayout-macOS" &&
39+
echo "===============================" &&
4040
time xcodebuild build -project PinLayout.xcodeproj -scheme PinLayout-macOS \
4141
-derivedDataPath $DERIVED_DATA -sdk macosx10.15 \
42-
| xcpretty
42+
| xcpretty &&
4343

44-
echo "==============================="
45-
echo "PinLayoutSample"
46-
echo "==============================="
44+
echo "===============================" &&
45+
echo "PinLayoutSample" &&
46+
echo "===============================" &&
4747
time xcodebuild build -workspace PinLayout.xcworkspace -scheme PinLayoutSample \
4848
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.0 \
4949
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
50-
| xcpretty
50+
| xcpretty &&
5151

5252

53-
echo "==============================="
54-
echo "iOS unit test"
55-
echo "==============================="
53+
echo "===============================" &&
54+
echo "iOS unit test" &&
55+
echo "===============================" &&
5656
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
5757
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.0 \
5858
-destination 'platform=iOS Simulator,name=iPhone 7,OS=11.4' \
59-
| xcpretty
59+
| xcpretty &&
6060

6161
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
6262
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.0 \
6363
-destination 'platform=iOS Simulator,name=iPhone 8,OS=12.2' \
64-
| xcpretty
64+
| xcpretty &&
6565

6666
time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-iOS \
6767
-derivedDataPath $DERIVED_DATA -sdk iphonesimulator13.0 \
6868
-destination 'platform=iOS Simulator,name=iPhone 8,OS=13.0' \
69-
| xcpretty
69+
| xcpretty &&
7070

7171
# echo "==============================="
7272
# echo "tvOS unit test"
@@ -89,62 +89,62 @@ time xcodebuild build test -workspace PinLayout.xcworkspace -scheme PinLayout-i
8989
# | xcpretty
9090

9191

92-
echo "==============================="
93-
echo " Cocoapods: iOS Empty project"
94-
echo "==============================="
95-
cd TestProjects/cocoapods/ios
96-
rm -rf $DERIVED_DATA
97-
pod install
92+
echo "===============================" &&
93+
echo " Cocoapods: iOS Empty project" &&
94+
echo "===============================" &&
95+
cd TestProjects/cocoapods/ios &&
96+
rm -rf $DERIVED_DATA &&
97+
pod install &&
9898
time xcodebuild clean build -workspace PinLayout-iOS.xcworkspace -scheme PinLayout-iOS \
9999
-sdk iphonesimulator13.0 -derivedDataPath $DERIVED_DATA \
100100
-destination 'platform=iOS Simulator,name=iPhone 8,OS=13.0' \
101-
| xcpretty
102-
cd ../../..
101+
| xcpretty &&
102+
cd ../../.. &&
103103

104104

105-
echo "==============================="
106-
echo " Cocoapods: macOS Empty project"
107-
echo "==============================="
108-
cd TestProjects/cocoapods/macos
109-
rm -rf $DERIVED_DATA
110-
pod install
105+
echo "===============================" &&
106+
echo " Cocoapods: macOS Empty project" &&
107+
echo "===============================" &&
108+
cd TestProjects/cocoapods/macos &&
109+
rm -rf $DERIVED_DATA &&
110+
pod install &&
111111
time xcodebuild clean build -workspace PinLayout-macOS.xcworkspace -scheme PinLayout-macOS \
112112
-sdk macosx10.15 -derivedDataPath $DERIVED_DATA \
113-
| xcpretty
114-
cd ../../..
113+
| xcpretty &&
114+
cd ../../.. &&
115115

116116

117-
echo "==============================="
118-
echo " Cocoapods: tvOS Empty project"
119-
echo "==============================="
120-
cd TestProjects/cocoapods/tvos
121-
rm -rf $DERIVED_DATA
122-
pod install
117+
echo "===============================" &&
118+
echo " Cocoapods: tvOS Empty project" &&
119+
echo "===============================" &&
120+
cd TestProjects/cocoapods/tvos &&
121+
rm -rf $DERIVED_DATA &&
122+
pod install &&
123123
time xcodebuild clean build -workspace PinLayout-tvOS.xcworkspace -scheme PinLayout-tvOS \
124124
-sdk appletvsimulator13.0 -derivedDataPath $DERIVED_DATA \
125125
-destination 'platform=tvOS Simulator,name=Apple TV,OS=13.0' \
126-
| xcpretty
127-
cd ../../..
128-
129-
130-
echo "==============================="
131-
echo " Carthage: iOS Empty project"
132-
echo "==============================="
133-
cd TestProjects/carthage/ios
134-
rm -rf $DERIVED_DATA
135-
rm Cartfile
136-
echo "git \"$TRAVIS_BUILD_DIR\" \"$TRAVIS_BRANCH\"" > Cartfile
137-
carthage update --use-ssh --platform iOS
126+
| xcpretty &&
127+
cd ../../.. &&
128+
129+
130+
echo "===============================" &&
131+
echo " Carthage: iOS Empty project" &&
132+
echo "===============================" &&
133+
cd TestProjects/carthage/ios &&
134+
rm -rf $DERIVED_DATA &&
135+
rm Cartfile &&
136+
echo "git \"$TRAVIS_BUILD_DIR\" \"$TRAVIS_BRANCH\"" > Cartfile &&
137+
carthage update --use-ssh --platform iOS &&
138138
time xcodebuild clean build -project PinLayout-Carthage-iOS.xcodeproj \
139139
-scheme PinLayout-Carthage-iOS -sdk iphonesimulator13.0 \
140140
-derivedDataPath $DERIVED_DATA \
141141
-destination 'platform=iOS Simulator,name=iPhone 8,OS=13.0' \
142-
| xcpretty
143-
cd ../../..
142+
| xcpretty &&
143+
cd ../../.. &&
144144

145-
echo "==============================="
146-
echo " Pod lib lint"
147-
echo "==============================="
145+
echo "===============================" &&
146+
echo " Pod lib lint" &&
147+
echo "===============================" &&
148148
time bundle exec pod lib lint --allow-warnings
149149

150150
# echo "=========================================="

0 commit comments

Comments
 (0)