Skip to content

Commit fa06a5a

Browse files
committed
Merge from upstream
2 parents 8784601 + fce986c commit fa06a5a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+1560
-11614
lines changed

.github/dependabot.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "gitsubmodule"
4+
directory: "/"
5+
target-branch: "master"
6+
schedule:
7+
interval: "daily"
8+
commit-message:
9+
prefix: "Git submodule"
10+
labels:
11+
- "dependencies"

.github/workflows/bridge.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
workflow_call:
77

88
env:
9+
CARGO_EXPAND_VERSION: "1.0.95"
910
FLUTTER_VERSION: "3.22.3"
1011
FLUTTER_RUST_BRIDGE_VERSION: "1.80.1"
1112
RUST_VERSION: "1.75" # https://github.com/rustdesk/rustdesk/discussions/7503
@@ -25,6 +26,8 @@ jobs:
2526
steps:
2627
- name: Checkout source code
2728
uses: actions/checkout@v4
29+
with:
30+
submodules: recursive
2831

2932
- name: Install prerequisites
3033
run: |
@@ -73,6 +76,7 @@ jobs:
7376
- name: Install flutter rust bridge deps
7477
shell: bash
7578
run: |
79+
cargo install cargo-expand --version ${{ env.CARGO_EXPAND_VERSION }} --locked
7680
cargo install flutter_rust_bridge_codegen --version ${{ env.FLUTTER_RUST_BRIDGE_VERSION }} --features "uuid" --locked
7781
pushd flutter && sed -i -e 's/extended_text: 14.0.0/extended_text: 13.0.0/g' pubspec.yaml && flutter pub get && popd
7882

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ jobs:
4545
# steps:
4646
# - name: Checkout source code
4747
# uses: actions/checkout@v3
48+
# with:
49+
# submodules: recursive
4850

4951
# - name: Install rust toolchain (v${{ env.MIN_SUPPORTED_RUST_VERSION }})
5052
# uses: actions-rs/toolchain@v1
@@ -92,6 +94,8 @@ jobs:
9294
9395
- name: Checkout source code
9496
uses: actions/checkout@v4
97+
with:
98+
submodules: recursive
9599

96100
- name: Install prerequisites
97101
shell: bash

.github/workflows/flutter-build.yml

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ env:
3131
FLUTTER_ELINUX_VERSION: "3.16.9"
3232
TAG_NAME: "${{ inputs.upload-tag }}"
3333
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
34-
# vcpkg version: 2024.11.16
35-
VCPKG_COMMIT_ID: "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c"
36-
VERSION: "1.3.6"
34+
# vcpkg version: 2025.01.13
35+
VCPKG_COMMIT_ID: "6f29f12e82a8293156836ad81cc9bf5af41fe836"
36+
VERSION: "1.3.7"
3737
NDK_VERSION: "r27c"
3838
#signing keys env variable checks
3939
ANDROID_SIGNING_KEY: "${{ secrets.ANDROID_SIGNING_KEY }}"
@@ -91,6 +91,8 @@ jobs:
9191
9292
- name: Checkout source code
9393
uses: actions/checkout@v4
94+
with:
95+
submodules: recursive
9496

9597
- name: Restore bridge files
9698
uses: actions/download-artifact@master
@@ -280,6 +282,8 @@ jobs:
280282
281283
- name: Checkout source code
282284
uses: actions/checkout@v4
285+
with:
286+
submodules: recursive
283287

284288
- name: Install LLVM and Clang
285289
uses: rustdesk-org/install-llvm-action-32bit@master
@@ -408,6 +412,8 @@ jobs:
408412
409413
- name: Checkout source code
410414
uses: actions/checkout@v4
415+
with:
416+
submodules: recursive
411417

412418
- name: Restore bridge files
413419
uses: actions/download-artifact@master
@@ -493,6 +499,9 @@ jobs:
493499
brew install nasm yasm
494500
- name: Checkout source code
495501
uses: actions/checkout@v4
502+
with:
503+
submodules: recursive
504+
496505
- name: Install flutter
497506
uses: subosito/flutter-action@v2
498507
with:
@@ -627,6 +636,8 @@ jobs:
627636
628637
- name: Checkout source code
629638
uses: actions/checkout@v4
639+
with:
640+
submodules: recursive
630641

631642
# $VCPKG_ROOT/vcpkg install --triplet arm64-ios --x-install-root="$VCPKG_ROOT/installed"
632643

@@ -699,6 +710,8 @@ jobs:
699710
700711
- name: Checkout source code
701712
uses: actions/checkout@v4
713+
with:
714+
submodules: recursive
702715

703716
- name: Import the codesign cert
704717
if: env.MACOS_P12_BASE64 != null
@@ -991,6 +1004,9 @@ jobs:
9911004
9921005
- name: Checkout source code
9931006
uses: actions/checkout@v4
1007+
with:
1008+
submodules: recursive
1009+
9941010
- name: Install flutter
9951011
uses: subosito/flutter-action@v2
9961012
with:
@@ -1060,16 +1076,6 @@ jobs:
10601076
prefix-key: rustdesk-lib-cache-android # TODO: drop '-android' part after caches are invalidated
10611077
key: ${{ matrix.job.target }}
10621078

1063-
- name: fix android for flutter 3.13
1064-
if: ${{ env.ANDROID_FLUTTER_VERSION == '3.13.9' }}
1065-
run: |
1066-
cd flutter
1067-
sed -i 's/uni_links_desktop/#uni_links_desktop/g' pubspec.yaml
1068-
sed -i 's/extended_text: .*/extended_text: 11.1.0/' pubspec.yaml
1069-
flutter pub get
1070-
cd lib
1071-
find . | grep dart | xargs sed -i 's/textScaler: TextScaler.linear(\(.*\)),/textScaleFactor: \1,/g'
1072-
10731079
- name: Build rustdesk lib
10741080
env:
10751081
ANDROID_NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }}
@@ -1267,6 +1273,9 @@ jobs:
12671273
12681274
- name: Checkout source code
12691275
uses: actions/checkout@v4
1276+
with:
1277+
submodules: recursive
1278+
12701279
- name: Install flutter
12711280
uses: subosito/flutter-action@v2
12721281
with:
@@ -1309,16 +1318,6 @@ jobs:
13091318
name: librustdesk.so.i686-linux-android
13101319
path: ./flutter/android/app/src/main/jniLibs/x86
13111320

1312-
- name: fix android for flutter 3.13
1313-
if: ${{ env.ANDROID_FLUTTER_VERSION == '3.13.9' }}
1314-
run: |
1315-
cd flutter
1316-
sed -i 's/uni_links_desktop/#uni_links_desktop/g' pubspec.yaml
1317-
sed -i 's/extended_text: .*/extended_text: 11.1.0/' pubspec.yaml
1318-
flutter pub get
1319-
cd lib
1320-
find . | grep dart | xargs sed -i 's/textScaler: TextScaler.linear(\(.*\)),/textScaleFactor: \1,/g'
1321-
13221321
- name: Build rustdesk
13231322
shell: bash
13241323
env:
@@ -1412,7 +1411,7 @@ jobs:
14121411
arch: aarch64,
14131412
target: aarch64-unknown-linux-gnu,
14141413
distro: ubuntu18.04,
1415-
on: [self-hosted, Linux, ARM64],
1414+
on: ubuntu-22.04-arm,
14161415
deb_arch: arm64,
14171416
vcpkg-triplet: arm64-linux,
14181417
}
@@ -1425,16 +1424,20 @@ jobs:
14251424
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
14261425
14271426
- name: Maximize build space
1428-
if: ${{ matrix.job.arch == 'x86_64' }}
14291427
run: |
14301428
sudo rm -rf /opt/ghc
14311429
sudo rm -rf /usr/local/lib/android
14321430
sudo rm -rf /usr/share/dotnet
14331431
sudo apt-get update -y
1434-
sudo apt-get install -y nasm qemu-user-static
1432+
sudo apt-get install -y nasm
1433+
if [[ "${{ matrix.job.arch }}" == "x86_64" ]]; then
1434+
sudo apt-get install -y qemu-user-static
1435+
fi
14351436
14361437
- name: Checkout source code
14371438
uses: actions/checkout@v4
1439+
with:
1440+
submodules: recursive
14381441

14391442
- name: Set Swap Space
14401443
if: ${{ matrix.job.arch == 'x86_64' }}
@@ -1731,7 +1734,6 @@ jobs:
17311734
17321735
build-rustdesk-linux-sciter:
17331736
if: ${{ inputs.upload-artifact }}
1734-
needs: build-rustdesk-linux # not for dep, just make it run later for parallelism
17351737
runs-on: ${{ matrix.job.on }}
17361738
timeout-minutes: 1440
17371739
name: build-rustdesk-linux-sciter ${{ matrix.job.target }}
@@ -1753,7 +1755,7 @@ jobs:
17531755
- {
17541756
arch: armv7,
17551757
target: armv7-unknown-linux-gnueabihf,
1756-
on: [self-hosted, Linux, ARM64],
1758+
on: ubuntu-22.04-arm,
17571759
distro: ubuntu18.04-rustdesk,
17581760
deb_arch: armhf,
17591761
sciter_arch: arm32,
@@ -1770,6 +1772,8 @@ jobs:
17701772
17711773
- name: Checkout source code
17721774
uses: actions/checkout@v4
1775+
with:
1776+
submodules: recursive
17731777

17741778
- name: Free Space
17751779
run: |
@@ -1966,6 +1970,8 @@ jobs:
19661970
steps:
19671971
- name: Checkout source code
19681972
uses: actions/checkout@v4
1973+
with:
1974+
submodules: recursive
19691975

19701976
- name: Download Binary
19711977
uses: actions/download-artifact@master
@@ -2031,13 +2037,15 @@ jobs:
20312037
target: aarch64-unknown-linux-gnu,
20322038
# try out newer flatpak since error of "error: Nothing matches org.freedesktop.Platform in remote flathub"
20332039
distro: ubuntu22.04,
2034-
on: [self-hosted, Linux, ARM64],
2040+
on: ubuntu-22.04-arm,
20352041
arch: aarch64,
20362042
suffix: "",
20372043
}
20382044
steps:
20392045
- name: Checkout source code
20402046
uses: actions/checkout@v4
2047+
with:
2048+
submodules: recursive
20412049

20422050
- name: Download Binary
20432051
uses: actions/download-artifact@master
@@ -2094,6 +2102,8 @@ jobs:
20942102
steps:
20952103
- name: Checkout source code
20962104
uses: actions/checkout@v4
2105+
with:
2106+
submodules: recursive
20972107

20982108
- name: Prepare env
20992109
run: |

.github/workflows/playground.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
1919
# vcpkg version: 2024.11.16
2020
VCPKG_COMMIT_ID: "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c"
21-
VERSION: "1.3.6"
21+
VERSION: "1.3.7"
2222
NDK_VERSION: "r26d"
2323
#signing keys env variable checks
2424
ANDROID_SIGNING_KEY: "${{ secrets.ANDROID_SIGNING_KEY }}"
@@ -90,7 +90,8 @@ jobs:
9090
uses: actions/checkout@v3
9191
with:
9292
ref: ${{ matrix.job.ref }}
93-
93+
submodules: recursive
94+
9495
- name: Import the codesign cert
9596
if: env.MACOS_P12_BASE64 != null
9697
uses: apple-actions/import-codesign-certs@v1
@@ -250,6 +251,7 @@ jobs:
250251
uses: actions/checkout@v3
251252
with:
252253
ref: ${{ matrix.job.ref }}
254+
submodules: recursive
253255

254256
- name: Install dependencies
255257
run: |

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "libs/hbb_common"]
2+
path = libs/hbb_common
3+
url = https://github.com/rustdesk/hbb_common

Cargo.lock

Lines changed: 15 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "rustdesk"
3-
version = "1.3.6"
3+
version = "1.3.7"
44
authors = ["rustdesk <info@rustdesk.com>"]
55
edition = "2021"
66
build= "build.rs"
@@ -181,7 +181,7 @@ members = ["libs/scrap", "libs/hbb_common", "libs/enigo", "libs/clipboard", "lib
181181
exclude = ["vdi/host", "examples/custom_plugin"]
182182

183183
[package.metadata.winres]
184-
LegalCopyright = "Copyright © 2024 Purslane Ltd. All rights reserved."
184+
LegalCopyright = "Copyright © 2025 Purslane Ltd. All rights reserved."
185185
ProductName = "RustDesk"
186186
FileDescription = "RustDesk Remote Desktop"
187187
OriginalFilename = "rustdesk.exe"

README.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<p align="center">
22
<img src="res/logo-header.svg" alt="RustDesk - Your remote desktop"><br>
3-
<a href="#public-servers">Servers</a> •
43
<a href="#raw-steps-to-build">Build</a> •
54
<a href="#how-to-build-with-docker">Docker</a> •
65
<a href="#file-structure">Structure</a> •
76
<a href="#snapshot">Snapshot</a><br>
8-
[<a href="docs/README-UA.md">Українська</a>] | [<a href="docs/README-CS.md">česky</a>] | [<a href="docs/README-ZH.md">中文</a>] | [<a href="docs/README-HU.md">Magyar</a>] | [<a href="docs/README-ES.md">Español</a>] | [<a href="docs/README-FA.md">فارسی</a>] | [<a href="docs/README-FR.md">Français</a>] | [<a href="docs/README-DE.md">Deutsch</a>] | [<a href="docs/README-PL.md">Polski</a>] | [<a href="docs/README-ID.md">Indonesian</a>] | [<a href="docs/README-FI.md">Suomi</a>] | [<a href="docs/README-ML.md">മലയാളം</a>] | [<a href="docs/README-JP.md">日本語</a>] | [<a href="docs/README-NL.md">Nederlands</a>] | [<a href="docs/README-IT.md">Italiano</a>] | [<a href="docs/README-RU.md">Русский</a>] | [<a href="docs/README-PTBR.md">Português (Brasil)</a>] | [<a href="docs/README-EO.md">Esperanto</a>] | [<a href="docs/README-KR.md">한국어</a>] | [<a href="docs/README-AR.md">العربي</a>] | [<a href="docs/README-VN.md">Tiếng Việt</a>] | [<a href="docs/README-DA.md">Dansk</a>] | [<a href="docs/README-GR.md">Ελληνικά</a>] | [<a href="docs/README-TR.md">Türkçe</a>]<br>
7+
[<a href="docs/README-UA.md">Українська</a>] | [<a href="docs/README-CS.md">česky</a>] | [<a href="docs/README-ZH.md">中文</a>] | [<a href="docs/README-HU.md">Magyar</a>] | [<a href="docs/README-ES.md">Español</a>] | [<a href="docs/README-FA.md">فارسی</a>] | [<a href="docs/README-FR.md">Français</a>] | [<a href="docs/README-DE.md">Deutsch</a>] | [<a href="docs/README-PL.md">Polski</a>] | [<a href="docs/README-ID.md">Indonesian</a>] | [<a href="docs/README-FI.md">Suomi</a>] | [<a href="docs/README-ML.md">മലയാളം</a>] | [<a href="docs/README-JP.md">日本語</a>] | [<a href="docs/README-NL.md">Nederlands</a>] | [<a href="docs/README-IT.md">Italiano</a>] | [<a href="docs/README-RU.md">Русский</a>] | [<a href="docs/README-PTBR.md">Português (Brasil)</a>] | [<a href="docs/README-EO.md">Esperanto</a>] | [<a href="docs/README-KR.md">한국어</a>] | [<a href="docs/README-AR.md">العربي</a>] | [<a href="docs/README-VN.md">Tiếng Việt</a>] | [<a href="docs/README-DA.md">Dansk</a>] | [<a href="docs/README-GR.md">Ελληνικά</a>] | [<a href="docs/README-TR.md">Türkçe</a>] | [<a href="docs/README-NO.md">Norsk</a>]<br>
98
<b>We need your help to translate this README, <a href="https://github.com/rustdesk/rustdesk/tree/master/src/lang">RustDesk UI</a> and <a href="https://github.com/rustdesk/doc.rustdesk.com">RustDesk Doc</a> to your native language</b>
109
</p>
1110

@@ -175,6 +174,3 @@ Please ensure that you are running these commands from the root of the RustDesk
175174

176175
![TCP Tunneling](https://github.com/rustdesk/rustdesk/assets/28412477/78e8708f-e87e-4570-8373-1360033ea6c5)
177176

178-
## [Public Servers](#public-servers)
179-
180-
RustDesk is supported by a free EU server, graciously provided by [Codext GmbH](https://codext.link/rustdesk?utm_source=github)

0 commit comments

Comments
 (0)