Merge pull request #275 from palfrey/fix-osx-deploy

Fixes for OSX deploy issues

.travis.yml

@@ -1,21 +1,22 @@
-matrix:
+# These two are defaults, which get overriden by the jobs matrix
+language: minimal
+os: linux
+
+jobs:
   include:
     - language: objective-c
+      os: osx
       osx_image: xcode8.3
-    - language: bash
+    - language: minimal
-      sudo: required
       dist: xenial
+      os: linux
       env: BUILD_DESTINATION=snapcraft
     - language: python
-      sudo: required
+      os: linux
       dist: xenial
       python: 3.6
       env: BUILD_DESTINATION=appimage
 
-branches:
-  only:
-  - master
-
 script:
 - if [ "$TRAVIS_OS_NAME" == "osx" ]; then python3 buildPy2app.py py2app ; fi
 - if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$BUILD_DESTINATION" == "snapcraft" ]; then sudo snapcraft cleanbuild ; fi

travis/macos-deploy.sh

@@ -11,3 +11,9 @@ mkdir dist/Syncplay.app/Contents/Resources/es_419.lproj
 pip3 install dmgbuild
 mv syncplay/resources/macOS_readme.pdf syncplay/resources/.macOS_readme.pdf
 dmgbuild -s appdmg.py "Syncplay" dist_bintray/Syncplay_${VER}.dmg
+
+# Workaround for deployment issues with newer openssl.
+# See https://travis-ci.community/t/ruby-openssl-python-deployment-fails-on-osx-image/6753/9
+for lib in ssl crypto; do ln -s /usr/local/opt/openssl{@1.0,}/lib/lib${lib}.1.0.0.dylib; done
+rvm reinstall $(travis_internal_ruby) --disable-binary
+for lib in ssl crypto; do rm /usr/local/opt/openssl/lib/lib${lib}.1.0.0.dylib; done

travis/macos-install.sh

@@ -1,14 +1,29 @@
 #!/usr/bin/env bash
 
-brew update
+set -ex
-brew upgrade python
+
+export HOMEBREW_NO_INSTALL_CLEANUP=1
+
+# Reinstall openssl to fix Python pip install issues
+brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e9004bd764c9436750a50e0b428548f68fe6a38a/Formula/openssl@1.1.rb
+
+# Python 3.7.4 with 10.12 bottle
+brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/e9004bd764c9436750a50e0b428548f68fe6a38a/Formula/python.rb
+
 which python3
 python3 --version
 which pip3
 pip3 --version
-brew install albertosottile/syncplay/pyside
+
+# Pyside 5.13.0 for 10.12 bottle
+brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/99219f0923014b24f33eae624fbfe83772c35f54/Formula/pyside.rb
+
+# Explicitly upgrade Qt 5.13.1 as the pyside above needs it
+brew upgrade https://raw.githubusercontent.com/Homebrew/homebrew-core/dcc34dd3cb24cb4f7cfa0047ccdb712d7cc4c6e4/Formula/qt.rb
+
 python3 -c "from PySide2 import __version__; print(__version__)"
 python3 -c "from PySide2.QtCore import __version__; print(__version__)" 
+python3 -c "import ssl; print(ssl)"
 pip3 install py2app
 python3 -c "from py2app.recipes import pyside2"
 pip3 install twisted[tls] appnope requests certifi