Skip to content

Commit

Permalink
Fixes ruby bug on Travis
Browse files Browse the repository at this point in the history
  • Loading branch information
julianmi committed May 30, 2017
1 parent 7592be5 commit d775456
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 26 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,8 @@ before_install:
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt${QT_LONG}-trusty; fi
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then sudo apt-get update -qq; fi
- if [ "${TRAVIS_OS_NAME}" = "linux" ]; then sudo apt-get install -y -qq qt${QT_BASE}base qt${QT_BASE}script qt${QT_BASE}tools; fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then rvm install ruby-2.3.1; rvm use 2.3.1; fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew update; fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew install gpg; fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then rvm get stable --auto-dotfiles; fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew install ccache; fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then PATH=$PATH:/usr/local/opt/ccache/libexec; fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew install qt; fi
Expand Down
44 changes: 22 additions & 22 deletions doc/doc.qrc
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<RCC>
<qresource prefix="/">
<file>images/dialog_main.png</file>
<file>images/help.png</file>
<file>images/main_statusbar.png</file>
<file>images/append.png</file>
<file>images/conf.png</file>
<file>images/main.png</file>
<file>images/new_pw.png</file>
<file>images/pw.png</file>
<file>images/new_pro.png</file>
<file>images/ms.png</file>
<file>about.md</file>
<file>doc.html</file>
<file>doc.qrc</file>
<file>help.md</file>
<file>logfile.md</file>
<file>main.md</file>
<file>questionnaire.md</file>
<file>wizard.md</file>
</qresource>
</RCC>
<RCC>
<qresource prefix="/">
<file>images/dialog_main.png</file>
<file>images/help.png</file>
<file>images/main_statusbar.png</file>
<file>images/append.png</file>
<file>images/conf.png</file>
<file>images/main.png</file>
<file>images/new_pw.png</file>
<file>images/pw.png</file>
<file>images/new_pro.png</file>
<file>images/ms.png</file>
<file>about.md</file>
<file>doc.html</file>
<file>doc.qrc</file>
<file>help.md</file>
<file>logfile.md</file>
<file>main.md</file>
<file>questionnaire.md</file>
<file>wizard.md</file>
</qresource>
</RCC>
6 changes: 4 additions & 2 deletions tools/mac_osx_deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ else
mv ${TRAVIS_BUILD_DIR}/build/release/EffortLog.dmg ${TRAVIS_BUILD_DIR}/build/release/EffortLog_$1_osx.dmg
otool -L ${TRAVIS_BUILD_DIR}/build/release/EffortLog.app/Contents/MacOS/EffortLog
elif [ $2 = "crypt" ]; then
install_name_tool -change /usr/local/opt/openssl/lib/libssl.1.0.0.dylib @executable_path/../Frameworks/libssl.1.0.0.dylib
install_name_tool -change /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib @executable_path/../Frameworks/libcrypto.1.0.0.dylib
install_name_tool -id @executable_path/../Frameworks/libssl.1.0.0.dylib EffortLog.app/Contents/Frameworks/libssl.1.0.0.dylib
install_name_tool -id @executable_path/../Frameworks/libcrypto.1.0.0.dylib EffortLog.app/Contents/Frameworks/libcrypto.1.0.0.dylib
install_name_tool -change /usr/local/opt/openssl/lib/libssl.1.0.0.dylib @executable_path/../Frameworks/libssl.1.0.0.dylib EffortLog.app/Contents/MacOS/EffortLog
install_name_tool -change /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib @executable_path/../Frameworks/libcrypto.1.0.0.dylib EffortLog.app/Contents/MacOS/EffortLog
/usr/local/opt/qt5/bin/macdeployqt ${TRAVIS_BUILD_DIR}/build/release/EffortLog.app -always-overwrite -verbose=3 -appstore-compliant -dmg
mv ${TRAVIS_BUILD_DIR}/build/release/EffortLog.dmg ${TRAVIS_BUILD_DIR}/build/release/EffortLog_$1_osx_encrypted.dmg
otool -L ${TRAVIS_BUILD_DIR}/build/release/EffortLog.app/Contents/MacOS/EffortLog
Expand Down

0 comments on commit d775456

Please sign in to comment.