travis macos fix

- auto install tap
- share connectionState
- service crash fix

.travis.yml

@@ -11,16 +11,38 @@ jobs:
     - name: MacOS
       os: osx
       osx_image: xcode12.2
-                
+      
+      env:
+        - QT_VERSION=5.15.1
+        
+      before_install:
+        - export CERTIFICATE_P12=deploy/PrivacyTechAppleCert.p12
+        - export KEYCHAIN=build.keychain
+        - security create-keychain -p $MAC_CERT_PW $KEYCHAIN
+        - security default-keychain -s $KEYCHAIN
+        - security unlock-keychain -p $MAC_CERT_PW $KEYCHAIN
+        - security import $CERTIFICATE_P12 -k $KEYCHAIN -P $MAC_CERT_PW -T /usr/bin/codesign
+  
       script:
         - |
-          if [ ! -f $HOME/Qt/5.14.2/clang_64/bin/qmake ]; then \
+          if [ ! -f $HOME/Qt/$QT_VERSION/clang_64/bin/qmake ]; then \
           brew install p7zip && \
           pip3 install aqtinstall requests py7zr && \
-          python3 -m aqt install --outputdir $HOME/Qt 5.14.2 mac desktop clang_64 -m qtbase && \
+          python3 -m aqt install --outputdir $HOME/Qt $QT_VERSION mac desktop clang_64 -m qtbase && \
           python3 -m aqt tool --outputdir $HOME/Qt mac tools_ifw 4.0.1 qt.tools.ifw.40;
           fi
-        - bash deploy/build_macos.sh  
+        - bash deploy/build_macos.sh 
+
+      deploy:
+        provider: releases
+        token: $GH_TOKEN
+        skip_cleanup: true
+        file:
+        - "AmneziaVPN.dmg"
+        on:
+          tags: true
+          branch: master
+    
   
     - name: Windows
       os: windows
@@ -44,24 +66,24 @@ jobs:
         - echo -e "\r\n" >> winbuild.bat
         - echo 'call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvarsamd64_x86.bat"' >> winbuild.bat
         - echo -e "\r\n" >> winbuild.bat
-        - echo -e "deploy\\\build_windows.bat" >> winbuild.bat
-        - cat winbuild.bat
+        - echo -e "set WIN_CERT_PW=$WIN_CERT_PW" >> winbuild.bat
+        - echo -e "\r\n" >> winbuild.bat
+        - echo -e "call deploy\\\build_windows.bat" >> winbuild.bat
         - cmd //c winbuild.bat
         
-
+      deploy:
+        provider: releases
+        token: $GH_TOKEN
+        skip_cleanup: true
+        file:
+        - "AmneziaVPN.exe"
+        on:
+          tags: true
+          branch: master
 
 deploy:
-  provider: releases
-  api_key: $GH_TOKEN
-  file:
-  - "AmneziaVPN.exe"
-  - "AmneziaVPN.dmg"
-    
   skip_cleanup: true
-  on:
-    tags: true
-    branch: master
-    
+  
 before_cache:
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then brew cleanup; fi
   # Cache only .git files under "/usr/local/Homebrew" so "brew update" does not take 5min every build

deploy/build_macos.sh

@@ -35,7 +35,7 @@ echo "Brew Qt version $(brew --prefix qt)"
 #if [ -f $(brew --prefix qt)/clang_64/bin/qmake ]; then QT_BIN_DIR=$(brew --prefix qt)/clang_64/bin;
 #else QT_BIN_DIR=$HOME/Qt/5.14.2/clang_64/bin; fi
 
-QT_BIN_DIR=$HOME/Qt/5.14.2/clang_64/bin
+QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/bin
 
 #QIF_BIN_DIR=$HOME/Qt/Tools/QtInstallerFramework/4.0/bin
 QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/4.0/bin

deploy/build_windows.bat

@@ -99,3 +99,4 @@ cd %PROJECT_DIR%
 signtool sign /f "%SCRIPT_DIR:"=%\PrivacyTechWindowsCert.pfx" /p %WIN_CERT_PW% /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 %TARGET_FILENAME%
 
 echo "Finished, see %TARGET_FILENAME%"
+exit 0