Explorar o código

CI: Reduce travis output verbosity

The log output of the travis CI for macOS is unreasonably large.  This
reduces the verbosity of the output and reduces the size of the build
logs significantly.
jp9000 %!s(int64=7) %!d(string=hai) anos
pai
achega
89a5235ac0
Modificáronse 2 ficheiros con 26 adicións e 5 borrados
  1. 16 5
      CI/install-dependencies-osx.sh
  2. 10 0
      CI/install/osx/build_app.py

+ 16 - 5
CI/install-dependencies-osx.sh

@@ -1,3 +1,9 @@
+hr() {
+  echo "───────────────────────────────────────────────────"
+  echo $1
+  echo "───────────────────────────────────────────────────"
+}
+
 # Exit if something fails
 # Exit if something fails
 set -e
 set -e
 
 
@@ -11,7 +17,8 @@ cd ../
 
 
 # Install Packages app so we can build a package later
 # Install Packages app so we can build a package later
 # http://s.sudre.free.fr/Software/Packages/about.html
 # http://s.sudre.free.fr/Software/Packages/about.html
-wget --retry-connrefused --waitretry=1 https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg
+hr "Downloading Packages app"
+wget --quiet --retry-connrefused --waitretry=1 https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg
 sudo installer -pkg ./Packages.pkg -target /
 sudo installer -pkg ./Packages.pkg -target /
 
 
 brew update
 brew update
@@ -23,21 +30,25 @@ export PATH=/usr/local/opt/ccache/libexec:$PATH
 ccache -s || echo "CCache is not available."
 ccache -s || echo "CCache is not available."
 
 
 # Fetch and untar prebuilt OBS deps that are compatible with older versions of OSX
 # Fetch and untar prebuilt OBS deps that are compatible with older versions of OSX
-wget --retry-connrefused --waitretry=1 https://s3-us-west-2.amazonaws.com/obs-nightly/osx-deps.tar.gz
+hr "Downloading OBS deps"
+wget --quiet --retry-connrefused --waitretry=1 https://s3-us-west-2.amazonaws.com/obs-nightly/osx-deps.tar.gz
 tar -xf ./osx-deps.tar.gz -C /tmp
 tar -xf ./osx-deps.tar.gz -C /tmp
 
 
 # Fetch vlc codebase
 # Fetch vlc codebase
-wget --retry-connrefused --waitretry=1 -O vlc-master.zip https://github.com/videolan/vlc/archive/master.zip
+hr "Downloading VLC repo"
+wget --quiet --retry-connrefused --waitretry=1 -O vlc-master.zip https://github.com/videolan/vlc/archive/master.zip
 unzip -q ./vlc-master.zip
 unzip -q ./vlc-master.zip
 
 
 # Get sparkle
 # Get sparkle
-wget --retry-connrefused --waitretry=1 -O sparkle.tar.bz2 https://github.com/sparkle-project/Sparkle/releases/download/1.16.0/Sparkle-1.16.0.tar.bz2
+hr "Downloading Sparkle framework"
+wget --quiet --retry-connrefused --waitretry=1 -O sparkle.tar.bz2 https://github.com/sparkle-project/Sparkle/releases/download/1.16.0/Sparkle-1.16.0.tar.bz2
 mkdir ./sparkle
 mkdir ./sparkle
 tar -xf ./sparkle.tar.bz2 -C ./sparkle
 tar -xf ./sparkle.tar.bz2 -C ./sparkle
 sudo cp -R ./sparkle/Sparkle.framework /Library/Frameworks/Sparkle.framework
 sudo cp -R ./sparkle/Sparkle.framework /Library/Frameworks/Sparkle.framework
 
 
 # CEF Stuff
 # CEF Stuff
-wget --retry-connrefused --waitretry=1 https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
+hr "Downloading CEF"
+wget --quiet --retry-connrefused --waitretry=1 https://obs-nightly.s3-us-west-2.amazonaws.com/cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
 tar -xf ./cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
 tar -xf ./cef_binary_${CEF_BUILD_VERSION}_macosx64.tar.bz2
 cd ./cef_binary_${CEF_BUILD_VERSION}_macosx64
 cd ./cef_binary_${CEF_BUILD_VERSION}_macosx64
 # remove a broken test
 # remove a broken test

+ 10 - 0
CI/install/osx/build_app.py

@@ -82,6 +82,16 @@ for i in candidate_paths:
 	print("Checking " + i)
 	print("Checking " + i)
 	for root, dirs, files in walk(build_path+"/"+i):
 	for root, dirs, files in walk(build_path+"/"+i):
 		for file_ in files:
 		for file_ in files:
+			if ".ini" in file_:
+				continue
+			if ".png" in file_:
+				continue
+			if ".effect" in file_:
+				continue
+			if ".py" in file_:
+				continue
+			if ".json" in file_:
+				continue
 			path = root + "/" + file_
 			path = root + "/" + file_
 			try:
 			try:
 				out = check_output("{0}otool -L '{1}'".format(args.prefix, path), shell=True,
 				out = check_output("{0}otool -L '{1}'".format(args.prefix, path), shell=True,