Merge branch 'master' into forapi
# Conflicts: # debian/changelog
This commit is contained in:
commit
379ba44ad9
3 files changed
+8
-10
No files matched your search
@@ -65,7 +65,7 @@ jobs:
|
|||||||
run: chmod -v a+x target/${{ matrix.job.target }}/release/*
|
run: chmod -v a+x target/${{ matrix.job.target }}/release/*
|
||||||
|
|
||||||
- name: Publish Artifacts
|
- name: Publish Artifacts
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: binaries-linux-${{ matrix.job.name }}
|
name: binaries-linux-${{ matrix.job.name }}
|
||||||
path: |
|
path: |
|
||||||
@@ -155,7 +155,7 @@ jobs:
|
|||||||
recursive: false
|
recursive: false
|
||||||
|
|
||||||
- name: Publish Artifacts
|
- name: Publish Artifacts
|
||||||
uses: actions/upload-artifact@v3
|
uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: binaries-windows-x86_64
|
name: binaries-windows-x86_64
|
||||||
path: |
|
path: |
|
||||||
@@ -187,7 +187,7 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
|
|
||||||
- name: Download binaries (${{ matrix.job.os }} - ${{ matrix.job.name }})
|
- name: Download binaries (${{ matrix.job.os }} - ${{ matrix.job.name }})
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: binaries-${{ matrix.job.os }}-${{ matrix.job.name }}
|
name: binaries-${{ matrix.job.os }}-${{ matrix.job.name }}
|
||||||
path: ${{ matrix.job.name }}
|
path: ${{ matrix.job.name }}
|
||||||
@@ -230,7 +230,7 @@ jobs:
|
|||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
- name: Download binaries
|
- name: Download binaries
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: binaries-linux-${{ matrix.job.name }}
|
name: binaries-linux-${{ matrix.job.name }}
|
||||||
path: docker/rootfs/usr/bin
|
path: docker/rootfs/usr/bin
|
||||||
@@ -365,7 +365,7 @@ jobs:
|
|||||||
submodules: recursive
|
submodules: recursive
|
||||||
|
|
||||||
- name: Download binaries
|
- name: Download binaries
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: binaries-linux-${{ matrix.job.name }}
|
name: binaries-linux-${{ matrix.job.name }}
|
||||||
path: docker-classic/
|
path: docker-classic/
|
||||||
@@ -494,7 +494,7 @@ jobs:
|
|||||||
mkdir -p debian-build/${{ matrix.job.name }}/bin
|
mkdir -p debian-build/${{ matrix.job.name }}/bin
|
||||||
|
|
||||||
- name: Download binaries
|
- name: Download binaries
|
||||||
uses: actions/download-artifact@v3
|
uses: actions/download-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: binaries-linux-${{ matrix.job.name }}
|
name: binaries-linux-${{ matrix.job.name }}
|
||||||
path: debian-build/${{ matrix.job.name }}/bin
|
path: debian-build/${{ matrix.job.name }}/bin
|
||||||
|
|||||||
Generated
+1
-1
@@ -559,7 +559,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "default_net"
|
name = "default_net"
|
||||||
version = "0.1.0"
|
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 = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"regex",
|
"regex",
|
||||||
|
|||||||
Vendored
+1
-3
@@ -1,7 +1,5 @@
|
|||||||
rustdesk-server (1.1.14) UNRELEASED; urgency=medium
|
rustdesk-server (1.1.14) UNRELEASED; urgency=medium
|
||||||
* add KeyExchange
|
* Fix windows crash
|
||||||
* fix ws query online
|
|
||||||
* add Must Login
|
|
||||||
|
|
||||||
rustdesk-server (1.1.13) UNRELEASED; urgency=medium
|
rustdesk-server (1.1.13) UNRELEASED; urgency=medium
|
||||||
* Version check and refactor hbb_common to share with rustdesk client
|
* Version check and refactor hbb_common to share with rustdesk client
|
||||||
|
|||||||
Reference in new issue
Block a user