Browse Source

Merge pull request #290 from grpc/travis-log-folding

CI improvements: faster, log folding
Tim Burks 7 years ago
parent
commit
3f45d08c13
2 changed files with 15 additions and 12 deletions
  1. 9 10
      .travis.yml
  2. 6 2
      Makefile

+ 9 - 10
.travis.yml

@@ -49,13 +49,12 @@ addons:
 
 
 install: ./.travis-install.sh
 install: ./.travis-install.sh
 
 
-script: 
-  - export PATH=$HOME/local/bin:$PATH
-  - export LD_LIBRARY_PATH=$HOME/local/lib
-  - swift package -v resolve
-  - make all
-  - make test
-  - make test-plugin
-  - make test-echo
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make xcodebuild; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make clean && travis_wait 40 make build-carthage; fi
+script:
+  - echo -en 'travis_fold:start:script.environment\\r' && export PATH=$HOME/local/bin:$PATH && export LD_LIBRARY_PATH=$HOME/local/lib && echo -en 'travis_fold:end:script.environment\\r'
+  - echo -en 'travis_fold:start:swift.resolve-deps\\r' && swift package -v resolve && echo -en 'travis_fold:end:swift.resolve-deps\\r'
+  - echo -en 'travis_fold:start:make.all\\r' && make all && echo -en 'travis_fold:end:make.all\\r'
+  - echo -en 'travis_fold:start:make.test\\r' && make test && echo -en 'travis_fold:end:make.test\\r'
+  - echo -en 'travis_fold:start:make.test-plugin\\r' && make test-plugin && echo -en 'travis_fold:end:make.test-plugin\\r'
+  - echo -en 'travis_fold:start:make.test-echo\\r' && make test-echo && echo -en 'travis_fold:end:make.test-echo\\r'
+  - echo -en 'travis_fold:start:make.project\\r' && if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make project; fi && echo -en 'travis_fold:end:make.project\\r'
+  - echo -en 'travis_fold:start:make.build-carthage\\r' && if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then make clean && make build-carthage-debug; fi && echo -en 'travis_fold:end:make.build-carthage\\r'

+ 6 - 2
Makefile

@@ -44,11 +44,15 @@ xcodebuild: project
 build-carthage:
 build-carthage:
 	carthage build --no-skip-current
 	carthage build --no-skip-current
 
 
+build-carthage-debug:
+	carthage build --no-skip-current --configuration Debug --platform iOS, macOS
+
 clean:
 clean:
 	-rm -rf Packages
 	-rm -rf Packages
 	-rm -rf .build build
 	-rm -rf .build build
 	-rm -rf SwiftGRPC.xcodeproj
 	-rm -rf SwiftGRPC.xcodeproj
 	-rm -rf Package.pins Package.resolved
 	-rm -rf Package.pins Package.resolved
 	-rm -rf protoc-gen-swift protoc-gen-swiftgrpc
 	-rm -rf protoc-gen-swift protoc-gen-swiftgrpc
-	-cd Examples/Echo/PackageManager && make clean
-	-cd Examples/Simple/PackageManager && make clean
+	-cd Examples/Google/Datastore && make clean
+	-cd Examples/Google/NaturalLanguage && make clean
+	-cd Examples/Google/Spanner && make clean