fix windows stopVpn &&

Do not include images in the deployment
This commit is contained in:
Nova 2025-07-16 01:26:10 +03:30
parent eb579e14d8
commit bdbb26544e
3 changed files with 3 additions and 8 deletions

View File

@ -198,7 +198,7 @@ jobs:
source script/env_deploy.sh
find . -name artifacts.tgz | xargs -n1 tar xvzf
cd deployment
rm -rf *.pdb
rm -rf *.png *.pdb */*.pdb */*.png
####
bash ../script/pack_debian.sh ${{ github.event.inputs.tag }}
mv Throne.deb $version_standalone-debian-x64.deb

View File

@ -9,6 +9,3 @@ mkdir -p $DEST
#### Download geodata ####
curl -fLso $DEST/geoip.db "https://github.com/SagerNet/sing-geoip/releases/latest/download/geoip.db"
curl -fLso $DEST/geosite.db "https://github.com/SagerNet/sing-geosite/releases/latest/download/geosite.db"
#### copy res/public ####
cp res/public/* $DEST

View File

@ -2158,9 +2158,7 @@ bool MainWindow::StopVPNProcess() {
if (vpn_pid != 0) {
bool ok;
#ifdef Q_OS_WIN
auto ret = WinCommander::runProcessElevated("taskkill", {"/IM", "Core.exe",
"/FI",
"PID ne " + Int2String(core_process->processId())});
auto ret = WinCommander::runProcessElevated("taskkill", {"/F", "/PID", Int2String(vpn_pid)});
ok = ret == 0;
#endif
@ -2214,7 +2212,7 @@ void MainWindow::DownloadAssets(const QString &geoipUrl, const QString &geositeU
// to parse versions of format Throne-1.2.3-beta.2 or Throne-1.2.3
bool isNewer(QString version) {
if constexpr (NKR_VERSION == "") return false;
if (QString(NKR_VERSION).isEmpty()) return false;
version = version.mid(7); // take out Throne-
auto parts = version.replace("-", ".").split('.');
auto currentParts = QString(NKR_VERSION).replace("-", ".").split('.');