rms/DefaultVPN
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/DefaultVPN.git synced 2026-05-17 08:36:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github-amnezia:amnezia-vpn/amnezia-client into HEAD

Browse Source
This commit is contained in:
vkamn
2026-02-23 15:10:29 +07:00
parent 1abdd14741 fcd7eadf4c
commit 963befa8d7
70 changed files with 946 additions and 786 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
deploy/build_windows.bat
View File

@@ -31,6 +31,7 @@ set SCRIPT_DIR=%PROJECT_DIR:"=%\deploy
set WORK_DIR=%SCRIPT_DIR:"=%\build_%BUILD_ARCH:"=%
set APP_NAME=DefaultVPN
set APP_FILENAME=%APP_NAME:"=%.exe
set SERVICE_FILENAME=%APP_NAME:"=%-service.exe
set APP_DOMAIN=org.defaultvpn.package
set OUT_APP_DIR=%WORK_DIR:"=%\client\release
set PREBILT_DEPLOY_DATA_DIR=%PROJECT_DIR:"=%\client\3rd-prebuilt\deploy-prebuilt\windows\x%BUILD_ARCH:"=%
@@ -43,6 +44,7 @@ set STAGE_DIR=%WORK_DIR:"=%\stage
echo "Environment:"
echo "WORK_DIR: %WORK_DIR%"
echo "APP_FILENAME: %APP_FILENAME%"
echo "SERVICE_FILENAME: %SERVICE_FILENAME%"
echo "PROJECT_DIR: %PROJECT_DIR%"
echo "SCRIPT_DIR: %SCRIPT_DIR%"
echo "OUT_APP_DIR: %OUT_APP_DIR%"
@@ -74,7 +76,7 @@ if %errorlevel% neq 0 exit /b %errorlevel%
echo "Deploying..."
mkdir "%OUT_APP_DIR%"
copy "%WORK_DIR%\service\server\release\%APP_NAME%-service.exe" "%OUT_APP_DIR%"
copy "%WORK_DIR%\service\server\release\%SERVICE_FILENAME%" "%OUT_APP_DIR%"
rem copy "%WORK_DIR%\client\%APP_FILENAME%" "%OUT_APP_DIR%"
copy /Y "%PROJECT_DIR%\client\images\app.ico" "%OUT_APP_DIR%\AmneziaVPN.ico" >nul
@@ -83,7 +85,8 @@ echo "Signing exe"
cd %OUT_APP_DIR%
signtool sign /v /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.exe
"%QT_BIN_DIR:"=%\windeployqt" --release --qmldir "%PROJECT_DIR:"=%\client" --force --no-translations "%OUT_APP_DIR:"=%\%APP_FILENAME:"=%"
"%QT_BIN_DIR:"=%\windeployqt" --release --qmldir "%PROJECT_DIR:"=%\client" --force --no-translations --force-openssl "%OUT_APP_DIR:"=%\%APP_FILENAME:"=%"
"%QT_BIN_DIR:"=%\windeployqt" --release "%OUT_APP_DIR:"=%\%SERVICE_FILENAME:"=%"
signtool sign /v /n "Privacy Technologies OU" /fd sha256 /tr http://timestamp.comodoca.com/?td=sha256 /td sha256 *.dll

2
deploy/data/windows/x32/post_uninstall.cmd
View File

@@ -14,6 +14,8 @@ sc stop DefaultVPN-service
sc delete DefaultVPN-service
sc stop AmneziaWGTunnel$DefaultVPN
sc delete AmneziaWGTunnel$DefaultVPN
sc stop DefaultVPNSplitTunnel
sc delete DefaultVPNSplitTunnel
taskkill /IM "DefaultVPN-service.exe" /F
taskkill /IM "DefaultVPN.exe" /F

2
deploy/data/windows/x64/post_uninstall.cmd
View File

@@ -14,6 +14,8 @@ sc stop DefaultVPN-service
sc delete DefaultVPN-service
sc stop AmneziaWGTunnel$DefaultVPN
sc delete AmneziaWGTunnel$DefaultVPN
sc stop DefaultVPNSplitTunnel
sc delete DefaultVPNSplitTunnel
taskkill /IM "DefaultVPN-service.exe" /F
taskkill /IM "DefaultVPN.exe" /F

39
deploy/deploy_s3.sh
View File

@@ -1,9 +1,9 @@
#!/bin/sh
#!/bin/bash
set -e
VERSION=$1
if [[ $VERSION = '' ]]; then
if [[ -z "$VERSION" ]]; then
echo '::error::VERSION does not set. Exiting with error...'
exit 1
fi
@@ -14,20 +14,39 @@ cd dist
echo $VERSION >> VERSION
curl -s https://api.github.com/repos/amnezia-vpn/amnezia-client/releases/tags/$VERSION | jq -r .body | tr -d '\r' > CHANGELOG
curl -s https://api.github.com/repos/amnezia-vpn/amnezia-client/releases/tags/$VERSION | jq -r .published_at > RELEASE_DATE
if [[ $(cat CHANGELOG) = null ]]; then
echo '::error::Release does not exists. Exiting with error...'
exit 1
fi
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/DefaultVPN_${VERSION}_android9+_arm64-v8a.apk
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/DefaultVPN_${VERSION}_android9+_armeabi-v7a.apk
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/DefaultVPN_${VERSION}_android9+_x86.apk
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/DefaultVPN_${VERSION}_android9+_x86_64.apk
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/DefaultVPN_${VERSION}_linux_x64.tar
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/DefaultVPN_${VERSION}_macos.pkg
wget -q https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/DefaultVPN_${VERSION}_x64.exe
# Download files with error handling
download_file() {
local url=$1
local filename=$(basename "$url")
echo "Downloading $filename..."
if ! wget -q "$url"; then
echo "::error::Failed to download $filename from $url"
exit 8
fi
echo "Successfully downloaded $filename"
}
download_file https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/DefaultVPN_${VERSION}_android9+_arm64-v8a.apk
download_file https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/DefaultVPN_${VERSION}_android9+_armeabi-v7a.apk
download_file https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/DefaultVPN_${VERSION}_android9+_x86.apk
download_file https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/DefaultVPN_${VERSION}_android9+_x86_64.apk
download_file https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/DefaultVPN_${VERSION}_linux_x64.tar
download_file https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/DefaultVPN_${VERSION}_macos.pkg
download_file https://github.com/amnezia-vpn/amnezia-client/releases/download/${VERSION}/DefaultVPN_${VERSION}_x64.exe
cd ../
rclone sync ./dist/ r2:/updates/
echo "Syncing to R2..."
if ! rclone sync ./dist/ r2:/updates/; then
echo "::error::Failed to sync files to R2"
exit 8
fi
echo "Deployment completed successfully!"