mirror of
https://github.com/rustdesk/rustdesk.git
synced 2026-06-22 10:02:20 +00:00
Merge ff42ce1792 into b73e5bbfa0
This commit is contained in:
Dmitry Beskov
GitHub
commit
5eb317f30f
7 changed files with 30 additions and 134 deletions
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
|
|
@ -22,7 +22,7 @@ on:
|
|||
- "README.md"
|
||||
- "res/**"
|
||||
- "appimage/**"
|
||||
- "flatpak/**"
|
||||
- "com.rustdesk.RustDesk/**"
|
||||
|
||||
jobs:
|
||||
# ensure_cargo_fmt:
|
||||
|
|
|
|||
30
.github/workflows/flutter-build.yml
vendored
30
.github/workflows/flutter-build.yml
vendored
|
|
@ -1952,7 +1952,7 @@ jobs:
|
|||
|
||||
- name: Rename Binary
|
||||
run: |
|
||||
mv rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}${{ matrix.job.suffix }}.deb flatpak/rustdesk.deb
|
||||
mv rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}${{ matrix.job.suffix }}.deb com.rustdesk.RustDesk/rustdesk.deb
|
||||
|
||||
- uses: rustdesk-org/run-on-arch-action@d3fcfbb632b84cf7f6bc772bfaaa2c2f4f8789a8 # no release tag; commit 2026-05-26
|
||||
name: Build rustdesk flatpak package for ${{ matrix.job.arch }}
|
||||
|
|
@ -1968,17 +1968,35 @@ jobs:
|
|||
shell: /bin/bash
|
||||
install: |
|
||||
apt-get update -y
|
||||
apt-get install -y git flatpak flatpak-builder
|
||||
apt-get install -y git flatpak flatpak-builder jq
|
||||
run: |
|
||||
# disable git safe.directory
|
||||
git config --global --add safe.directory "*"
|
||||
pushd /workspace
|
||||
git submodule update --init --recursive com.rustdesk.RustDesk
|
||||
# flatpak deps
|
||||
flatpak --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||
# package
|
||||
pushd flatpak
|
||||
git clone https://github.com/flathub/shared-modules.git --depth=1
|
||||
flatpak-builder --user --install-deps-from=flathub -y --force-clean --repo=repo ./build ./rustdesk.json
|
||||
pushd com.rustdesk.RustDesk
|
||||
jq -e 'any(.modules[]?; type == "object" and .name == "rustdesk")' com.rustdesk.RustDesk.json > /dev/null
|
||||
jq '
|
||||
.["finish-args"] = (
|
||||
(.["finish-args"] // []) +
|
||||
(["--socket=wayland", "--socket=x11"] - (.["finish-args"] // []))
|
||||
) |
|
||||
(.modules[] | select(type == "object" and .name == "rustdesk").sources) = [
|
||||
{
|
||||
"type": "file",
|
||||
"path": "rustdesk.deb"
|
||||
},
|
||||
{
|
||||
"type": "file",
|
||||
"path": "com.rustdesk.RustDesk.metainfo.xml"
|
||||
}
|
||||
]
|
||||
' com.rustdesk.RustDesk.json > com.rustdesk.RustDesk.local.json
|
||||
jq -e 'any(.modules[]?; type == "object" and .name == "rustdesk" and any(.sources[]?; .type == "file" and .path == "rustdesk.deb"))' com.rustdesk.RustDesk.local.json > /dev/null
|
||||
flatpak-builder --user --install-deps-from=flathub -y --force-clean --repo=repo ./build ./com.rustdesk.RustDesk.local.json
|
||||
flatpak build-bundle ./repo rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}${{ matrix.job.suffix }}.flatpak com.rustdesk.RustDesk
|
||||
|
||||
- name: Publish flatpak package
|
||||
|
|
@ -1987,7 +2005,7 @@ jobs:
|
|||
prerelease: true
|
||||
tag_name: ${{ env.TAG_NAME }}
|
||||
files: |
|
||||
flatpak/rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}${{ matrix.job.suffix }}.flatpak
|
||||
com.rustdesk.RustDesk/rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}${{ matrix.job.suffix }}.flatpak
|
||||
|
||||
build-rustdesk-web:
|
||||
if: False
|
||||
|
|
|
|||
2
.github/workflows/flutter-ci.yml
vendored
2
.github/workflows/flutter-ci.yml
vendored
|
|
@ -15,7 +15,7 @@ on:
|
|||
- "README.md"
|
||||
- "res/**"
|
||||
- "appimage/**"
|
||||
- "flatpak/**"
|
||||
- "com.rustdesk.RustDesk/**"
|
||||
|
||||
jobs:
|
||||
run-ci:
|
||||
|
|
|
|||
3
.gitmodules
vendored
3
.gitmodules
vendored
|
|
@ -1,3 +1,6 @@
|
|||
[submodule "libs/hbb_common"]
|
||||
path = libs/hbb_common
|
||||
url = https://github.com/rustdesk/hbb_common
|
||||
[submodule "com.rustdesk.RustDesk"]
|
||||
path = com.rustdesk.RustDesk
|
||||
url = https://github.com/flathub/com.rustdesk.RustDesk.git
|
||||
|
|
|
|||
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<component type="desktop-application">
|
||||
<id>com.rustdesk.RustDesk</id>
|
||||
<developer id="com.rustdesk">
|
||||
<name>RustDesk</name>
|
||||
</developer>
|
||||
<launchable type="desktop-id">com.rustdesk.RustDesk.desktop</launchable>
|
||||
<metadata_license>CC0-1.0</metadata_license>
|
||||
<project_license>AGPL-3.0-only</project_license>
|
||||
<name>RustDesk</name>
|
||||
<summary>Secure remote desktop access</summary>
|
||||
<description>
|
||||
<p>
|
||||
RustDesk is a full-featured open source remote control alternative for self-hosting and security with minimal configuration.
|
||||
</p>
|
||||
<ul>
|
||||
<li> Works on Windows, macOS, Linux, iOS, Android, Web. </li>
|
||||
<li> Supports VP8 / VP9 / AV1 software codecs, and H264 / H265 hardware codecs. </li>
|
||||
<li> Own your data, easily set up self-hosting solution on your infrastructure. </li>
|
||||
<li> P2P connection with end-to-end encryption based on NaCl. </li>
|
||||
<li> No administrative privileges or installation needed for Windows, elevate privilege locally or from remote on demand. </li>
|
||||
<li> We like to keep things simple and will strive to make simpler where possible. </li>
|
||||
</ul>
|
||||
<p>
|
||||
For self-hosting setup instructions please go to our home page.
|
||||
</p>
|
||||
</description>
|
||||
<categories>
|
||||
<category>Utility</category>
|
||||
</categories>
|
||||
<screenshots>
|
||||
<screenshot type="default">
|
||||
<caption>Remote desktop session</caption>
|
||||
<image>https://user-images.githubusercontent.com/71636191/171661982-430285f0-2e12-4b1d-9957-4a58e375304d.png</image>
|
||||
</screenshot>
|
||||
</screenshots>
|
||||
<branding>
|
||||
<color type="primary" scheme_preference="light">#d9eaf8</color>
|
||||
<color type="primary" scheme_preference="dark">#0160ee</color>
|
||||
</branding>
|
||||
<url type="homepage">https://rustdesk.com</url>
|
||||
<url type="bugtracker">https://github.com/rustdesk/rustdesk/issues</url>
|
||||
<url type="faq">https://github.com/rustdesk/rustdesk/wiki/FAQ</url>
|
||||
<url type="help">https://rustdesk.com/docs</url>
|
||||
<url type="donation">https://ko-fi.com/rustdesk</url>
|
||||
<url type="vcs-browser">https://github.com/rustdesk/rustdesk</url>
|
||||
<url type="translate">https://github.com/rustdesk/rustdesk/tree/master/src/lang</url>
|
||||
<url type="contribute">https://github.com/rustdesk/rustdesk/blob/master/docs/CONTRIBUTING.md</url>
|
||||
<url type="contact">https://rustdesk.com/docs/en/technical-support</url>
|
||||
<requires>
|
||||
<display_length compare="ge">600</display_length>
|
||||
<internet>always</internet>
|
||||
</requires>
|
||||
<supports>
|
||||
<control>keyboard</control>
|
||||
<control>pointing</control>
|
||||
</supports>
|
||||
<content_rating type="oars-1.1"/>
|
||||
</component>
|
||||
|
|
@ -1,66 +0,0 @@
|
|||
{
|
||||
"id": "com.rustdesk.RustDesk",
|
||||
"runtime": "org.freedesktop.Platform",
|
||||
"runtime-version": "24.08",
|
||||
"sdk": "org.freedesktop.Sdk",
|
||||
"command": "rustdesk",
|
||||
"cleanup": ["/include", "/lib/pkgconfig", "/share/gtk-doc"],
|
||||
"rename-desktop-file": "rustdesk.desktop",
|
||||
"rename-icon": "rustdesk",
|
||||
"modules": [
|
||||
"shared-modules/libappindicator/libappindicator-gtk3-12.10.json",
|
||||
{
|
||||
"name": "xdotool",
|
||||
"no-autogen": true,
|
||||
"make-install-args": ["PREFIX=${FLATPAK_DEST}"],
|
||||
"sources": [
|
||||
{
|
||||
"type": "archive",
|
||||
"url": "https://github.com/jordansissel/xdotool/releases/download/v3.20211022.1/xdotool-3.20211022.1.tar.gz",
|
||||
"sha256": "96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "pam",
|
||||
"buildsystem": "autotools",
|
||||
"config-opts": ["--disable-selinux"],
|
||||
"sources": [
|
||||
{
|
||||
"type": "archive",
|
||||
"url": "https://github.com/linux-pam/linux-pam/releases/download/v1.3.1/Linux-PAM-1.3.1.tar.xz",
|
||||
"sha256": "eff47a4ecd833fbf18de9686632a70ee8d0794b79aecb217ebd0ce11db4cd0db"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "rustdesk",
|
||||
"buildsystem": "simple",
|
||||
"build-commands": [
|
||||
"bsdtar -Oxf rustdesk.deb data.tar.xz | bsdtar -xf -",
|
||||
"cp -r usr/* /app/",
|
||||
"mkdir -p /app/bin && ln -s /app/share/rustdesk/rustdesk /app/bin/rustdesk"
|
||||
],
|
||||
"sources": [
|
||||
{
|
||||
"type": "file",
|
||||
"path": "rustdesk.deb"
|
||||
},
|
||||
{
|
||||
"type": "file",
|
||||
"path": "com.rustdesk.RustDesk.metainfo.xml"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"finish-args": [
|
||||
"--share=ipc",
|
||||
"--socket=wayland",
|
||||
"--socket=x11",
|
||||
"--share=network",
|
||||
"--filesystem=home",
|
||||
"--device=dri",
|
||||
"--socket=pulseaudio",
|
||||
"--talk-name=org.freedesktop.Flatpak"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,3 +1,3 @@
|
|||
#! /usr/bin/env bash
|
||||
sed -i "s/$1/$2/g" res/*spec res/PKGBUILD flutter/pubspec.yaml Cargo.toml .github/workflows/*yml flatpak/*json appimage/*yml libs/portable/Cargo.toml
|
||||
sed -i "s/$1/$2/g" res/*spec res/PKGBUILD flutter/pubspec.yaml Cargo.toml .github/workflows/*yml appimage/*yml libs/portable/Cargo.toml
|
||||
cargo run # to bump version in cargo lock
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue