diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index ec9fa862..4fd8f553 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -42,12 +42,18 @@ jobs: export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin bash deploy/build_linux.sh - - name: 'Upload artifact' + - name: 'Upload installer artifact' uses: actions/upload-artifact@v3 with: - name: AmneziaVPN_Linux + name: AmneziaVPN_Linux_installer path: deploy/AmneziaVPN_Linux_Installer - retention-days: 3 + retention-days: 7 + - name: 'Upload unpacked artifact' + uses: actions/upload-artifact@v3 + with: + name: AmneziaVPN_Linux_unpacked + path: deploy/AppDir + retention-days: 7 # ------------------------------------------------------ @@ -97,12 +103,18 @@ jobs: set QIF_BIN_DIR="${{ runner.temp }}\\Qt\\Tools\\QtInstallerFramework\\${{ env.QIF_VERSION }}\\bin" call deploy\\build_windows.bat - - name: 'Upload artifact' + - name: 'Upload installer artifact' uses: actions/upload-artifact@v3 with: - name: AmneziaVPN_Windows + name: AmneziaVPN_Windows_installer path: AmneziaVPN_x${{ env.BUILD_ARCH }}.exe - retention-days: 3 + retention-days: 7 + - name: 'Upload unpacked artifact' + uses: actions/upload-artifact@v3 + with: + name: AmneziaVPN_Windows_unpacked + path: deploy\\build_${{ env.BUILD_ARCH }}\\client\\Release + retention-days: 7 # ------------------------------------------------------ @@ -225,12 +237,18 @@ jobs: export QIF_BIN_DIR="${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin" bash deploy/build_macos.sh - - name: 'Upload artifact' + - name: 'Upload installer artifact' uses: actions/upload-artifact@v3 with: - name: AmneziaVPN_MacOS + name: AmneziaVPN_MacOS_installer path: AmneziaVPN.dmg - retention-days: 3 + retention-days: 7 + - name: 'Upload unpacked artifact' + uses: actions/upload-artifact@v3 + with: + name: AmneziaVPN_MacOS_unpacked + path: deploy/build/client/AmneziaVPN.app + retention-days: 7 # ------------------------------------------------------ diff --git a/CMakeLists.txt b/CMakeLists.txt index fa841819..e8dbd7c7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR) set(PROJECT AmneziaVPN) project(${PROJECT}) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 004385b7..0b97443f 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR) set(PROJECT AmneziaVPN) project(${PROJECT} VERSION 2.1.2) diff --git a/client/protocols/openvpnovercloakprotocol.cpp b/client/protocols/openvpnovercloakprotocol.cpp index 5ba2c587..55939895 100644 --- a/client/protocols/openvpnovercloakprotocol.cpp +++ b/client/protocols/openvpnovercloakprotocol.cpp @@ -109,8 +109,6 @@ QString OpenVpnOverCloakProtocol::cloakExecPath() { #ifdef Q_OS_WIN return Utils::executable(QString("cloak/ck-client"), true); -#elif defined Q_OS_LINUX - return Utils::usrExecutable("ck-client"); #else return Utils::executable(QString("/ck-client"), true); #endif diff --git a/client/protocols/shadowsocksvpnprotocol.cpp b/client/protocols/shadowsocksvpnprotocol.cpp index c200df24..82ae08b8 100644 --- a/client/protocols/shadowsocksvpnprotocol.cpp +++ b/client/protocols/shadowsocksvpnprotocol.cpp @@ -109,8 +109,6 @@ QString ShadowSocksVpnProtocol::shadowSocksExecPath() { #ifdef Q_OS_WIN return Utils::executable(QString("ss/ss-local"), true); -#elif defined Q_OS_LINUX - return Utils::usrExecutable(QString("ss-local")); #else return Utils::executable(QString("/ss-local"), true); #endif diff --git a/deploy/data/linux/client/bin/ck-client b/deploy/data/linux/client/bin/ck-client new file mode 100755 index 00000000..a6ef310c Binary files /dev/null and b/deploy/data/linux/client/bin/ck-client differ diff --git a/deploy/data/linux/client/bin/ss-local b/deploy/data/linux/client/bin/ss-local new file mode 100755 index 00000000..292abf6f Binary files /dev/null and b/deploy/data/linux/client/bin/ss-local differ diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt index abde0c70..567e9d49 100644 --- a/service/CMakeLists.txt +++ b/service/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR) set(PROJECT service) project(${PROJECT}) @@ -16,4 +16,4 @@ endif() if(WIN32) add_subdirectory(wireguard-service) -endif() \ No newline at end of file +endif() diff --git a/service/server/CMakeLists.txt b/service/server/CMakeLists.txt index 23df6424..16fe77ec 100644 --- a/service/server/CMakeLists.txt +++ b/service/server/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR) set(PROJECT AmneziaVPN-service) project(${PROJECT}) diff --git a/service/wireguard-service/CMakeLists.txt b/service/wireguard-service/CMakeLists.txt index 6e064f71..33a3d584 100644 --- a/service/wireguard-service/CMakeLists.txt +++ b/service/wireguard-service/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.23.0 FATAL_ERROR) +cmake_minimum_required(VERSION 3.25.0 FATAL_ERROR) set(PROJECT wireguard-service) project(${PROJECT} LANGUAGES CXX)