Merge branch 'qt_migration' into refactoring/logging

.github/workflows/deploy.yml

@@ -42,6 +42,13 @@ jobs:
         export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin
         bash deploy/build_linux.sh
 
+    - name: 'Upload artifact'
+      uses: actions/upload-artifact@v3
+      with:
+        name: AmneziaVPN_Linux
+        path: deploy/AmneziaVPN_Linux_Installer
+        retention-days: 3
+
 # ------------------------------------------------------
 
   Build-Windows:
@@ -90,6 +97,13 @@ jobs:
         set QIF_BIN_DIR="${{ runner.temp }}\\Qt\\Tools\\QtInstallerFramework\\${{ env.QIF_VERSION }}\\bin"
         call deploy\\build_windows.bat
 
+    - name: 'Upload artifact'
+      uses: actions/upload-artifact@v3
+      with:
+        name: AmneziaVPN_Windows
+        path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe
+        retention-days: 3
+
 # ------------------------------------------------------
 
   Build-IOS:
@@ -166,14 +180,6 @@ jobs:
         team-id: 'X7UJ388FXK'
         configuration: Release
 
-
-
-
-
-
-
-
-
 # ------------------------------------------------------
 
   Build-MacOS:
@@ -219,6 +225,13 @@ jobs:
         export QIF_BIN_DIR="${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin"
         bash deploy/build_macos.sh
 
+    - name: 'Upload artifact'
+      uses: actions/upload-artifact@v3
+      with:
+        name: AmneziaVPN_MacOS
+        path: AmneziaVPN.dmg
+        retention-days: 3
+
 # ------------------------------------------------------
 
   Build-Android:

client/CMakeLists.txt

@@ -292,8 +292,6 @@ endif()
 if(IOS)
     message("Client iOS build")
 
-
-
     find_package(Qt6 REQUIRED COMPONENTS ShaderTools)
     set(LIBS ${LIBS} Qt6::ShaderTools)
 
@@ -346,7 +344,11 @@ qt_add_executable(${PROJECT} ${SOURCES} ${HEADERS} ${RESOURCES} ${QRC})
 qt_add_translations(${PROJECT} TS_FILES
     ${CMAKE_CURRENT_LIST_DIR}/translations/amneziavpn_ru.ts)
 
-# NETWORKEXTENSION=1
+if(APPLE AND NOT IOS)
+    set_target_properties(AmneziaVPN PROPERTIES
+        MACOSX_BUNDLE TRUE
+    )
+endif()
 
 if(IOS)
     enable_language(OBJC)

deploy/build_macos.sh

@@ -38,9 +38,9 @@ DMG_FILENAME=$PROJECT_DIR/${APP_NAME}.dmg
 
 # Seacrh Qt
 if [ -z "${QT_VERSION+x}" ]; then
-QT_VERSION=5.15.2;
+QT_VERSION=6.4.1;
 QIF_VERSION=4.1
-QT_BIN_DIR=$HOME/Qt/$QT_VERSION/clang_64/bin
+QT_BIN_DIR=$HOME/Qt/$QT_VERSION/macos/bin
 QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin
 fi
 
@@ -58,9 +58,7 @@ echo "Building App..."
 cd $BUILD_DIR
 
 $QT_BIN_DIR/qt-cmake -S $PROJECT_DIR -B $BUILD_DIR
-cmake --build . --config release
+cmake --build . --config release --target all
-# $QT_BIN_DIR/qmake $PROJECT_DIR/AmneziaVPN.pro 'CONFIG+=release CONFIG+=x86_64'
-# make -j `sysctl -n hw.ncpu`
 
 # Build and run tests here
 
@@ -74,7 +72,7 @@ echo "Packaging ..."
 #cd $DEPLOY_DIR
 
 $QT_BIN_DIR/macdeployqt $OUT_APP_DIR/$APP_FILENAME -always-overwrite -qmldir=$PROJECT_DIR
-cp -av $BUILD_DIR/service/server/$APP_NAME-service.app/Contents/macOS/$APP_NAME-service $BUNDLE_DIR/Contents/macOS
+cp -av $BUILD_DIR/service/server/$APP_NAME-service $BUNDLE_DIR/Contents/macOS
 cp -Rv $PROJECT_DIR/deploy/data/macos/* $BUNDLE_DIR/Contents/macOS
 rm -f $BUNDLE_DIR/Contents/macOS/post_install.sh $BUNDLE_DIR/Contents/macOS/post_uninstall.sh