From bcdfda43af9e5956e740ab4a36480fac47e97bed Mon Sep 17 00:00:00 2001 From: 21pages Date: Wed, 22 Jan 2025 20:27:25 +0800 Subject: [PATCH 1/4] update dep (#507) Signed-off-by: 21pages --- Cargo.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 90f4714..eec9780 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -558,7 +558,7 @@ dependencies = [ [[package]] name = "default_net" version = "0.1.0" -source = "git+https://github.com/rustdesk-org/default_net#c400b0bbf49a987129796221fbc41a8a385b812e" +source = "git+https://github.com/rustdesk-org/default_net#78f8f70cd85151a3a2c4a3230d80d5272703c02e" dependencies = [ "anyhow", "regex", From 1fd1a2a3b60c2ba4bbef2f1fc2cfef5ae028df08 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Sat, 25 Jan 2025 20:37:16 +0800 Subject: [PATCH 2/4] 1.1.14 --- .github/workflows/build.yaml | 2 +- Cargo.lock | 2 +- Cargo.toml | 2 +- debian/changelog | 4 ++++ ui/setup.nsi | 2 +- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cc17ca8..fd62260 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -35,7 +35,7 @@ jobs: - { name: "arm64v8", target: "aarch64-unknown-linux-musl" } - { name: "armv7", target: "armv7-unknown-linux-musleabihf" } - { name: "i386", target: "i686-unknown-linux-musl" } - #- { name: "amd64fb", target: "x86_64-unknown-freebsd" } + - { name: "amd64fb", target: "x86_64-unknown-freebsd" } steps: diff --git a/Cargo.lock b/Cargo.lock index eec9780..a87da66 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1068,7 +1068,7 @@ dependencies = [ [[package]] name = "hbbs" -version = "1.1.13" +version = "1.1.14" dependencies = [ "async-speed-limit", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 9a72b78..4ca6d74 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hbbs" -version = "1.1.13" +version = "1.1.14" authors = ["rustdesk "] edition = "2021" build = "build.rs" diff --git a/debian/changelog b/debian/changelog index 76c04a8..193d701 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,7 @@ +rustdesk-server (1.1.14) UNRELEASED; urgency=medium + * Fix windows crash + * Fix freebsd + rustdesk-server (1.1.13) UNRELEASED; urgency=medium * Version check and refactor hbb_common to share with rustdesk client diff --git a/ui/setup.nsi b/ui/setup.nsi index b48e1ab..fe58a1c 100644 --- a/ui/setup.nsi +++ b/ui/setup.nsi @@ -15,7 +15,7 @@ !define PRODUCT_NAME "rustdesk_server" !define PRODUCT_DESCRIPTION "Installer for ${PRODUCT_NAME}" !define COPYRIGHT "Copyright © 2021" -!define VERSION "1.1.13" +!define VERSION "1.1.14" VIProductVersion "${VERSION}.0" VIAddVersionKey "ProductName" "${PRODUCT_NAME}" From 8557c4ab8259a9084879ad78a41c5a9539fd75a3 Mon Sep 17 00:00:00 2001 From: rustdesk Date: Sat, 25 Jan 2025 20:47:19 +0800 Subject: [PATCH 3/4] freebsd still not work --- .github/workflows/build.yaml | 2 +- debian/changelog | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index fd62260..cc17ca8 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -35,7 +35,7 @@ jobs: - { name: "arm64v8", target: "aarch64-unknown-linux-musl" } - { name: "armv7", target: "armv7-unknown-linux-musleabihf" } - { name: "i386", target: "i686-unknown-linux-musl" } - - { name: "amd64fb", target: "x86_64-unknown-freebsd" } + #- { name: "amd64fb", target: "x86_64-unknown-freebsd" } steps: diff --git a/debian/changelog b/debian/changelog index 193d701..bb8a832 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ rustdesk-server (1.1.14) UNRELEASED; urgency=medium * Fix windows crash - * Fix freebsd rustdesk-server (1.1.13) UNRELEASED; urgency=medium * Version check and refactor hbb_common to share with rustdesk client From 801826f36de11dca61811ad90ef06b46cc9c59c4 Mon Sep 17 00:00:00 2001 From: RustDesk <71636191+rustdesk@users.noreply.github.com> Date: Fri, 31 Jan 2025 15:11:28 +0800 Subject: [PATCH 4/4] Update build.yaml --- .github/workflows/build.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cc17ca8..cfab435 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -65,7 +65,7 @@ jobs: run: chmod -v a+x target/${{ matrix.job.target }}/release/* - name: Publish Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: binaries-linux-${{ matrix.job.name }} path: | @@ -155,7 +155,7 @@ jobs: recursive: false - name: Publish Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: binaries-windows-x86_64 path: | @@ -187,7 +187,7 @@ jobs: steps: - name: Download binaries (${{ matrix.job.os }} - ${{ matrix.job.name }}) - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: binaries-${{ matrix.job.os }}-${{ matrix.job.name }} path: ${{ matrix.job.name }} @@ -230,7 +230,7 @@ jobs: submodules: recursive - name: Download binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: binaries-linux-${{ matrix.job.name }} path: docker/rootfs/usr/bin @@ -353,7 +353,7 @@ jobs: submodules: recursive - name: Download binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: binaries-linux-${{ matrix.job.name }} path: docker-classic/ @@ -483,7 +483,7 @@ jobs: mkdir -p debian-build/${{ matrix.job.name }}/bin - name: Download binaries - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: binaries-linux-${{ matrix.job.name }} path: debian-build/${{ matrix.job.name }}/bin