From 85020270d57eee07775776a5290ed79faca2bf34 Mon Sep 17 00:00:00 2001 From: pokamest Date: Sun, 8 Jan 2023 17:21:51 -0800 Subject: [PATCH 1/4] MacOS deploy fix --- .github/workflows/deploy.yml | 8 -------- client/CMakeLists.txt | 8 +++++--- deploy/build_macos.sh | 10 ++++------ 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 187150da..a5d2359e 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -166,14 +166,6 @@ jobs: team-id: 'X7UJ388FXK' configuration: Release - - - - - - - - # ------------------------------------------------------ Build-MacOS: diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 8aeddc32..1a1f052d 100644 --- a/client/CMakeLists.txt +++ b/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) diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index 869a1ccc..9b80a958 100755 --- a/deploy/build_macos.sh +++ b/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 -# $QT_BIN_DIR/qmake $PROJECT_DIR/AmneziaVPN.pro 'CONFIG+=release CONFIG+=x86_64' -# make -j `sysctl -n hw.ncpu` +cmake --build . --config release --target all # 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 From f735b401df0c877df3487d950169ed8ed504190e Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Sun, 18 Dec 2022 09:45:26 +0300 Subject: [PATCH 2/4] added deploy artifacts to github actions, artifact lifetime 1 day --- .github/workflows/deploy.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index a5d2359e..04688670 100644 --- a/.github/workflows/deploy.yml +++ b/.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: AmneziaVPN.bundle + retention-days: 1 + # ------------------------------------------------------ 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: 1 + # ------------------------------------------------------ Build-IOS: @@ -211,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: 1 + # ------------------------------------------------------ Build-Android: From 396422ee3a05055c7abbc20203f50aa44371f6cb Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Mon, 9 Jan 2023 12:44:36 +0300 Subject: [PATCH 3/4] increased storage time for artifacts up to 3 days --- .github/workflows/deploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 04688670..57692d80 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -47,7 +47,7 @@ jobs: with: name: AmneziaVPN_Linux path: AmneziaVPN.bundle - retention-days: 1 + retention-days: 3 # ------------------------------------------------------ @@ -102,7 +102,7 @@ jobs: with: name: AmneziaVPN_Windows path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe - retention-days: 1 + retention-days: 3 # ------------------------------------------------------ @@ -230,7 +230,7 @@ jobs: with: name: AmneziaVPN_MacOS path: AmneziaVPN.dmg - retention-days: 1 + retention-days: 3 # ------------------------------------------------------ From 118bb53c03ff73fabf3c63d7a2fa9eab66635473 Mon Sep 17 00:00:00 2001 From: "vladimir.kuznetsov" Date: Mon, 9 Jan 2023 16:41:24 +0300 Subject: [PATCH 4/4] fixed path to linux installer --- .github/workflows/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 57692d80..27d17c0d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -46,7 +46,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: AmneziaVPN_Linux - path: AmneziaVPN.bundle + path: deploy/AmneziaVPN_Linux_Installer retention-days: 3 # ------------------------------------------------------