Use xcbeautify in mac github builds, and upload full build logs

DeaDBeeF-Player · Oct 12, 2024 · ca58311 · ca58311
1 parent 6f962ee
commit ca58311
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/macbuild.yml b/.github/workflows/macbuild.yml
@@ -23,5 +23,10 @@ jobs:
     - name: Upload artifact
       uses: actions/upload-artifact@v4
       with:
-        name: mac
-        path: osx/build/Release/*.zip
+        name: deadbeef-macos-universal
+        path: osx/build/Release/DeaDBeeF.app
+    - name: Upload logs
+      uses: actions/upload-artifact@v4
+      with:
+        name: build-logs
+        path: osx/build/Release/*.log
diff --git a/travis/build.sh b/travis/build.sh
@@ -21,13 +21,13 @@ case "$TRAVIS_OS_NAME" in
     ;;
     osx)
         echo gem install xcpretty ...
-        gem install xcpretty 1> /dev/null 2> /dev/null
+        brew install xcbeautify 1> /dev/null 2> /dev/null
         VERSION=`tr -d '\r' < PORTABLE_VERSION`
         /usr/libexec/PlistBuddy -c "Set CFBundleShortVersionString $VERSION" plugins/cocoaui/deadbeef-Info.plist
         rev=`git rev-parse --short HEAD`
-        /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $rev"  plugins/cocoaui/deadbeef-Info.plist
-        xcodebuild "MACOSX_DEPLOYMENT_TARGET=10.13" test -project osx/deadbeef.xcodeproj -scheme deadbeef -configuration Release | xcpretty -t ; test ${PIPESTATUS[0]} -eq 0
-        xcodebuild "MACOSX_DEPLOYMENT_TARGET=10.13" -project osx/deadbeef.xcodeproj -target DeaDBeeF -configuration Release -quiet | xcpretty ; test ${PIPESTATUS[0]} -eq 0
+        /usr/libexec/PlistBuddy -c "Set :CFBundleVersion $rev" plugins/cocoaui/deadbeef-Info.plist
+        xcodebuild "MACOSX_DEPLOYMENT_TARGET=10.13" test -project osx/deadbeef.xcodeproj -scheme deadbeef -configuration Release | xcbeautify ; test ${PIPESTATUS[0]} -eq 0
+        xcodebuild "MACOSX_DEPLOYMENT_TARGET=10.13" -project osx/deadbeef.xcodeproj -target DeaDBeeF -configuration Release -quiet | tee osx/build/Release/build.log | xcbeautify ; test ${PIPESTATUS[0]} -eq 0
         cd osx/build/Release
         zip -r deadbeef-$VERSION-macos-universal.zip DeaDBeeF.app
         cd ../../..