Просмотр исходного кода

Merge branch 'master' into forapi

# Conflicts:
#	debian/changelog
lejianwen 1 год назад
Родитель
Сommit
379ba44ad9
3 измененных файлов с 8 добавлено и 10 удалено
  1. 6 6
      .github/workflows/build.yaml
  2. 1 1
      Cargo.lock
  3. 1 3
      debian/changelog

+ 6 - 6
.github/workflows/build.yaml

@@ -65,7 +65,7 @@ jobs:
65
         run: chmod -v a+x target/${{ matrix.job.target }}/release/*
65
         run: chmod -v a+x target/${{ matrix.job.target }}/release/*
66
 
66
 
67
       - name: Publish Artifacts
67
       - name: Publish Artifacts
68
-        uses: actions/upload-artifact@v3
68
+        uses: actions/upload-artifact@v4
69
         with:
69
         with:
70
           name: binaries-linux-${{ matrix.job.name }}
70
           name: binaries-linux-${{ matrix.job.name }}
71
           path: |
71
           path: |
@@ -155,7 +155,7 @@ jobs:
155
           recursive: false
155
           recursive: false
156
 
156
 
157
       - name: Publish Artifacts
157
       - name: Publish Artifacts
158
-        uses: actions/upload-artifact@v3
158
+        uses: actions/upload-artifact@v4
159
         with:
159
         with:
160
           name: binaries-windows-x86_64
160
           name: binaries-windows-x86_64
161
           path: |
161
           path: |
@@ -187,7 +187,7 @@ jobs:
187
     steps:
187
     steps:
188
 
188
 
189
       - name: Download binaries (${{ matrix.job.os }} - ${{ matrix.job.name }})
189
       - name: Download binaries (${{ matrix.job.os }} - ${{ matrix.job.name }})
190
-        uses: actions/download-artifact@v3
190
+        uses: actions/download-artifact@v4
191
         with:
191
         with:
192
           name: binaries-${{ matrix.job.os }}-${{ matrix.job.name }}
192
           name: binaries-${{ matrix.job.os }}-${{ matrix.job.name }}
193
           path: ${{ matrix.job.name }}
193
           path: ${{ matrix.job.name }}
@@ -230,7 +230,7 @@ jobs:
230
           submodules: recursive
230
           submodules: recursive
231
         
231
         
232
       - name: Download binaries
232
       - name: Download binaries
233
-        uses: actions/download-artifact@v3
233
+        uses: actions/download-artifact@v4
234
         with:
234
         with:
235
           name: binaries-linux-${{ matrix.job.name }}
235
           name: binaries-linux-${{ matrix.job.name }}
236
           path: docker/rootfs/usr/bin
236
           path: docker/rootfs/usr/bin
@@ -365,7 +365,7 @@ jobs:
365
           submodules: recursive
365
           submodules: recursive
366
         
366
         
367
       - name: Download binaries
367
       - name: Download binaries
368
-        uses: actions/download-artifact@v3
368
+        uses: actions/download-artifact@v4
369
         with:
369
         with:
370
           name: binaries-linux-${{ matrix.job.name }}
370
           name: binaries-linux-${{ matrix.job.name }}
371
           path: docker-classic/
371
           path: docker-classic/
@@ -494,7 +494,7 @@ jobs:
494
           mkdir -p debian-build/${{ matrix.job.name }}/bin
494
           mkdir -p debian-build/${{ matrix.job.name }}/bin
495
 
495
 
496
       - name: Download binaries
496
       - name: Download binaries
497
-        uses: actions/download-artifact@v3
497
+        uses: actions/download-artifact@v4
498
         with:
498
         with:
499
           name: binaries-linux-${{ matrix.job.name }}
499
           name: binaries-linux-${{ matrix.job.name }}
500
           path: debian-build/${{ matrix.job.name }}/bin
500
           path: debian-build/${{ matrix.job.name }}/bin

+ 1 - 1
Cargo.lock

@@ -559,7 +559,7 @@ dependencies = [
559
 [[package]]
559
 [[package]]
560
 name = "default_net"
560
 name = "default_net"
561
 version = "0.1.0"
561
 version = "0.1.0"
562
-source = "git+https://github.com/rustdesk-org/default_net#c400b0bbf49a987129796221fbc41a8a385b812e"
562
+source = "git+https://github.com/rustdesk-org/default_net#78f8f70cd85151a3a2c4a3230d80d5272703c02e"
563
 dependencies = [
563
 dependencies = [
564
  "anyhow",
564
  "anyhow",
565
  "regex",
565
  "regex",

+ 1 - 3
debian/changelog

@@ -1,7 +1,5 @@
1
 rustdesk-server (1.1.14) UNRELEASED; urgency=medium
1
 rustdesk-server (1.1.14) UNRELEASED; urgency=medium
2
-  * add KeyExchange
3
-  * fix ws query online
4
-  * add Must Login
2
+  * Fix windows crash
5
 
3
 
6
 rustdesk-server (1.1.13) UNRELEASED; urgency=medium
4
 rustdesk-server (1.1.13) UNRELEASED; urgency=medium
7
   * Version check and refactor hbb_common to share with rustdesk client
5
   * Version check and refactor hbb_common to share with rustdesk client