Merge pull request #279 from palfrey/ruby-reinstall

Remove ruby reinstall workaround for openssl, as not needed
This commit is contained in:
Alberto Sottile 2020-03-22 19:29:02 +01:00 committed by GitHub
commit 3c273417f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -ex
mkdir dist/Syncplay.app/Contents/Resources/English.lproj mkdir dist/Syncplay.app/Contents/Resources/English.lproj
mkdir dist/Syncplay.app/Contents/Resources/en_AU.lproj mkdir dist/Syncplay.app/Contents/Resources/en_AU.lproj
mkdir dist/Syncplay.app/Contents/Resources/en_GB.lproj mkdir dist/Syncplay.app/Contents/Resources/en_GB.lproj
@ -11,9 +13,3 @@ mkdir dist/Syncplay.app/Contents/Resources/es_419.lproj
pip3 install dmgbuild pip3 install dmgbuild
mv syncplay/resources/macOS_readme.pdf syncplay/resources/.macOS_readme.pdf mv syncplay/resources/macOS_readme.pdf syncplay/resources/.macOS_readme.pdf
dmgbuild -s appdmg.py "Syncplay" dist_bintray/Syncplay_${VER}.dmg 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