travis release

.travis.yml

@@ -48,7 +48,19 @@ jobs:
         - cmd //c winbuild.bat
         
 
-        
+
+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_windows.bat

@@ -2,16 +2,21 @@
 
 CHCP 1252
 
+REM %VAR:"=% mean dequoted %VAR%
+
 set QT_BIN_DIR="c:\Qt\5.14.2\msvc2017\bin"
 set QIF_BIN_DIR="c:\Qt\Tools\QtInstallerFramework\4.0\bin"
 
+set PATH=%QT_BIN_DIR:"=%;%PATH%
+
 echo "Using Qt in %QT_BIN_DIR%"
 echo "Using QIF in %QIF_BIN_DIR%"
 
-# Hold on to current directory
+REM Hold on to current directory
 set PROJECT_DIR=%cd%
 set SCRIPT_DIR=%PROJECT_DIR:"=%\deploy
 
+rmdir /Q /S %WORK_DIR%
 mkdir %SCRIPT_DIR:"=%\build
 set WORK_DIR=%SCRIPT_DIR:"=%\build
 
@@ -21,7 +26,7 @@ set APP_FILENAME=%APP_NAME:"=%.exe
 set APP_DOMAIN=org.amneziavpn.package
 set RELEASE_DIR=%WORK_DIR:"=%
 set OUT_APP_DIR=%RELEASE_DIR:"=%\client\release
-set DEPLOY_DATA_DIR=%LAUNCH_DIR:"=%\data\windows
+set DEPLOY_DATA_DIR=%SCRIPT_DIR:"=%\data\windows
 set INSTALLER_DATA_DIR=%RELEASE_DIR:"=%\installer\packages\%APP_DOMAIN:"=%\data
 set PRO_FILE_PATH=%PROJECT_DIR:"=%\%APP_NAME:"=%.pro
 set QMAKE_STASH_FILE=%PROJECT_DIR:"=%\.qmake_stash
@@ -45,6 +50,7 @@ Del %QMAKE_STASH_FILE%
 Del %TARGET_FILENAME%
 
 "%QT_BIN_DIR:"=%\qmake" -v
+"%QT_BIN_DIR:"=%\windeployqt" -v
 nmake /?
 
 cd %PROJECT_DIR%
@@ -53,16 +59,27 @@ cd %PROJECT_DIR%
 cd %WORK_DIR%
 set CL=/MP
 nmake /A /NOLOGO
+break
 nmake clean
 rem if not exist "%OUT_APP_DIR:"=%\%APP_FILENAME:"=%" break
- 
+
 echo "Deploying..."
-"%QT_BIN_DIR:"=%\windeployqt" --release --force --no-translations "%OUT_APP_DIR:"=%\%APP_FILENAME:"=%"
+
-echo "Copying deploy data..."
-xcopy %DEPLOY_DATA_DIR% 											%OUT_APP_DIR%  /s /e /y /i /f
 copy "%WORK_DIR:"=%\service\server\release\%APP_NAME:"=%-service.exe"	%OUT_APP_DIR%
 copy "%WORK_DIR:"=%\platform\post-uninstall\release\post-uninstall.exe"	%OUT_APP_DIR%
 
+echo "Signing exe"
+cd %OUT_APP_DIR%
+signtool sign /f "%SCRIPT_DIR:"=%\PrivacyTechWindowsCert.pfx" /p %WIN_CERT_PW% /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.exe
+ 
+"%QT_BIN_DIR:"=%\windeployqt" --release --force --no-translations "%OUT_APP_DIR:"=%\%APP_FILENAME:"=%"
+signtool sign /f "%SCRIPT_DIR:"=%\PrivacyTechWindowsCert.pfx" /p %WIN_CERT_PW% /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.dll
+
+
+echo "Copying deploy data..."
+xcopy %DEPLOY_DATA_DIR% 											%OUT_APP_DIR%  /s /e /y /i /f
+
+
 cd %SCRIPT_DIR%
 xcopy %SCRIPT_DIR:"=%\installer 									%RELEASE_DIR:"=%\installer /s /e /y /i /f
 mkdir %INSTALLER_DATA_DIR%
@@ -78,6 +95,7 @@ cd "%RELEASE_DIR:"=%\installer"
 echo "Creating installer..."
 "%QIF_BIN_DIR:"=%\binarycreator" --offline-only -v -c config\windows.xml -p packages -f %TARGET_FILENAME%
 
-
 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%"