From 1883d4c269132fef044509bd626633c8261e8345 Mon Sep 17 00:00:00 2001 From: sD Date: Sat, 18 Apr 2020 14:33:30 +0200 Subject: [PATCH 1/5] zip it and upload the correct file --- .travis.yml | 3 ++- scripts/macos_post_build.sh | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5d384b0..1a0dcab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ deploy: provider: releases api_key: secure: mZCNwnqKeqJP5CqgYOanYnr/KHydxueGPRhvGLpY0Pop7MiH3CIHMN5dhHbtgJvE5GGMR4xUIEhPpmkCEJw7YiPREMqT4mkV4DR531ZLB3t/FizyvIwXuP6jFwzTofZ51qHfBpcurVc9sMFeD9Pw+rLTTgIiXL2sZxUUXc8U+ZZug1lYndgcO6P00fUJd6V9lyFQUGmbSca97YbG6KuCym0fEpyRnMqzKLjYsUUo8UKRBADtmD822O6z2FSldNZDn45Mkx0MYfHWyT5hzTb7WGa+DrTB/0un1HqqsNPlb/ahjrFQQNR2qd7HNGZa+Mvwi6egTDug+k15x8lbkacUoi34U1eFq9LSTYm8dSO5g23I1OvGvjTCkDj1jOLPqB99XlbAJ0E/9Jzw7wtlLaAzvFzTj/B63TQnO3IsgHBWR14CZlf05WMOFf2irwl+kL6ktspIHnlGgaiWYYrKeAt7QJAXiQOdYDz6SaWVC6TyOE/SszXRU6xFotmCjkP2irM5yGE8SUw2uIzKjD9uG0ZXtbLcdQEFD316+qglqFTCjnKsRfbtQs2u5spZPsZSdsOZCbLfNIn0GSTFRymFsK6gsvji8AD8AZo0zcOZ/7NMVC6A8RnF3Ve+vU/xljhsIOxoLZDvZPia7WozdV99xmnepWBwkuoQs/K0xmWcnLZDcb0= - file: "../bin/Attorney_Online.app" + file: "../bin/Attorney_Online_mac_x86_64.zip" on: + tags: true repo: AttorneyOnline/AO2-Client diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh index 25400bf..d6eaddc 100755 --- a/scripts/macos_post_build.sh +++ b/scripts/macos_post_build.sh @@ -20,3 +20,5 @@ cp ../lib/* ../bin/Attorney_Online.app/Contents/Frameworks # libbass has a funny path for some reason, just use rpath install_name_tool -change @loader_path/libbass.dylib @rpath/libbass.dylib ../bin/Attorney_Online.app/Contents/MacOS/Attorney_Online + +zip -r ../bin/Attorney_Online_mac_x86_64.zip ../bin/ \ No newline at end of file From f4f441c24c69a28de092d2684e7c6cdff6a3509c Mon Sep 17 00:00:00 2001 From: sD Date: Sat, 18 Apr 2020 15:07:14 +0200 Subject: [PATCH 2/5] this and post_build do the same thing --- scripts/release_macos.sh | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100755 scripts/release_macos.sh diff --git a/scripts/release_macos.sh b/scripts/release_macos.sh deleted file mode 100755 index 50acb40..0000000 --- a/scripts/release_macos.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -# This script prepares the compiled bundle for shipping as a standalone release -# Assumes the Qt bin folder is in PATH -# Should be used on a "Release" build from QT creator -# Note that this DOES NOT add the base/ folder - -# Exit on errors and unset variables -set -eu - -ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/" - -cd ${ROOT_DIR} - -# This thing basically does all the work -macdeployqt ../bin/Attorney_Online.app - -# Need to add the dependencies -cp ../lib/* ../bin/Attorney_Online.app/Contents/Frameworks - -# libbass has a funny path for some reason, just use rpath -install_name_tool -change @loader_path/libbass.dylib @rpath/libbass.dylib ../bin/Attorney_Online.app/Contents/MacOS/Attorney_Online From c52dcac9ce751f4452e84a7e98acd74a18e8b53e Mon Sep 17 00:00:00 2001 From: sD Date: Sat, 18 Apr 2020 15:08:14 +0200 Subject: [PATCH 3/5] please build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1a0dcab..f24f07c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,6 @@ deploy: api_key: secure: mZCNwnqKeqJP5CqgYOanYnr/KHydxueGPRhvGLpY0Pop7MiH3CIHMN5dhHbtgJvE5GGMR4xUIEhPpmkCEJw7YiPREMqT4mkV4DR531ZLB3t/FizyvIwXuP6jFwzTofZ51qHfBpcurVc9sMFeD9Pw+rLTTgIiXL2sZxUUXc8U+ZZug1lYndgcO6P00fUJd6V9lyFQUGmbSca97YbG6KuCym0fEpyRnMqzKLjYsUUo8UKRBADtmD822O6z2FSldNZDn45Mkx0MYfHWyT5hzTb7WGa+DrTB/0un1HqqsNPlb/ahjrFQQNR2qd7HNGZa+Mvwi6egTDug+k15x8lbkacUoi34U1eFq9LSTYm8dSO5g23I1OvGvjTCkDj1jOLPqB99XlbAJ0E/9Jzw7wtlLaAzvFzTj/B63TQnO3IsgHBWR14CZlf05WMOFf2irwl+kL6ktspIHnlGgaiWYYrKeAt7QJAXiQOdYDz6SaWVC6TyOE/SszXRU6xFotmCjkP2irM5yGE8SUw2uIzKjD9uG0ZXtbLcdQEFD316+qglqFTCjnKsRfbtQs2u5spZPsZSdsOZCbLfNIn0GSTFRymFsK6gsvji8AD8AZo0zcOZ/7NMVC6A8RnF3Ve+vU/xljhsIOxoLZDvZPia7WozdV99xmnepWBwkuoQs/K0xmWcnLZDcb0= file: "../bin/Attorney_Online_mac_x86_64.zip" + draft: true on: - tags: true repo: AttorneyOnline/AO2-Client From 607e70aeba18fba150bee674f7c0671d3c78aacf Mon Sep 17 00:00:00 2001 From: sD Date: Sat, 18 Apr 2020 15:08:33 +0200 Subject: [PATCH 4/5] compress it more --- scripts/macos_post_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/macos_post_build.sh b/scripts/macos_post_build.sh index d6eaddc..df1475c 100755 --- a/scripts/macos_post_build.sh +++ b/scripts/macos_post_build.sh @@ -21,4 +21,4 @@ cp ../lib/* ../bin/Attorney_Online.app/Contents/Frameworks # libbass has a funny path for some reason, just use rpath install_name_tool -change @loader_path/libbass.dylib @rpath/libbass.dylib ../bin/Attorney_Online.app/Contents/MacOS/Attorney_Online -zip -r ../bin/Attorney_Online_mac_x86_64.zip ../bin/ \ No newline at end of file +zip -r -9 ../bin/Attorney_Online_mac_x86_64.zip ../bin/ \ No newline at end of file From 8bc7915f17396f93c1fd5146e1c3ff7a70145471 Mon Sep 17 00:00:00 2001 From: sD Date: Sat, 18 Apr 2020 17:11:45 +0200 Subject: [PATCH 5/5] only deploy on tagged commits --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index f24f07c..dbd19cd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,4 +17,5 @@ deploy: file: "../bin/Attorney_Online_mac_x86_64.zip" draft: true on: + tags: true repo: AttorneyOnline/AO2-Client