feat: Update linux build deps

This commit is contained in:
Nova 2024-09-04 06:43:16 +03:30
parent 6f2832643f
commit 5105b5ff82
3 changed files with 16 additions and 15 deletions

View File

@ -70,7 +70,7 @@ jobs:
- platform: windows-2022
arch: x64
qt_version: "6.7.2"
- platform: ubuntu-20.04
- platform: ubuntu-22.04
arch: x64
qt_version: "6.7.2"
- platform: macos-13
@ -100,7 +100,7 @@ jobs:
path: download-artifact
# ========================================================================================================= Qt Install
- name: Linux - Install Qt
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-22.04'
uses: jurplel/install-qt-action@v4.0.0
with:
version: ${{ matrix.qt_version }}
@ -152,8 +152,9 @@ jobs:
./libs/deploy_windows64.sh
- name: Linux - Generate MakeFile and Build
shell: bash
if: matrix.platform == 'ubuntu-20.04'
if: matrix.platform == 'ubuntu-22.04'
run: |
sudo apt update && sudo apt upgrade -y
mkdir build
pushd build
cmake -GNinja -DQT_VERSION_MAJOR=6 -DCMAKE_BUILD_TYPE=Release ..

View File

@ -25,6 +25,8 @@ cd ../..
mv $DEPLOYMENT/public_res/* $DEST
sudo add-apt-repository universe
sudo apt install libfuse2
wget https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20240109-1/linuxdeploy-x86_64.AppImage
wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/1-alpha-20240109-1/linuxdeploy-plugin-qt-x86_64.AppImage
chmod +x linuxdeploy-x86_64.AppImage linuxdeploy-plugin-qt-x86_64.AppImage

View File

@ -4,9 +4,9 @@ set -e
version="$1"
mkdir -p nekoray/DEBIAN
mkdir -p nekoray/usr/share
cp -r linux64 nekoray/usr/share
mv nekoray/usr/share/linux64 nekoray/usr/share/nekoray
mkdir -p nekoray/opt
cp -r linux64 nekoray/opt
mv nekoray/opt/linux64 nekoray/opt/nekoray
# basic
cat >nekoray/DEBIAN/control <<-EOF
@ -14,25 +14,23 @@ Package: nekoray
Version: $version
Architecture: amd64
Maintainer: Mahdi Mahdi.zrei@gmail.com
Depends: libxcb-util1, libqt6core6, libqt6dbus6, libqt6gui6, libqt6network6, libqt6widgets6, libqt6svg6, libicu-dev, libxcb-cursor0, desktop-file-utils
Depends: desktop-file-utils
Description: Qt based cross-platform GUI proxy configuration manager (backend: sing-box)
EOF
cat >nekoray/DEBIAN/postinst <<-EOF
if [ ! -s /usr/share/applications/nekoray.desktop ]; then
cat >/usr/share/applications/nekoray.desktop<<-END
cat >/usr/share/applications/nekoray.desktop<<-END
[Desktop Entry]
Name=Nekoray
Name=nekoray
Comment=Qt based cross-platform GUI proxy configuration manager (backend: sing-box)
Exec=sh -c "PATH=/usr/share/nekoray/launcher:\$PATH /usr/share/nekoray/nekobox -appdata"
Icon=/usr/share/nekoray/nekobox.png
Exec=sudo /opt/nekoray/launcher
Icon=/opt/nekoray/nekobox.png
Terminal=false
Type=Application
Categories=Network;Application;
END
fi
setcap cap_sys_admin=ep /usr/share/nekoray/nekoray
setcap cap_sys_admin=ep /opt/nekoray/launcher
update-desktop-database
EOF
@ -41,4 +39,4 @@ sudo chmod 0755 nekoray/DEBIAN/postinst
# desktop && PATH
sudo dpkg-deb -Zxz --build nekoray
sudo dpkg-deb --build nekoray