Skip to content

Commit 7ca5a67

Browse files
committed
delete secrets artifact, update readme
1 parent 19bab19 commit 7ca5a67

6 files changed

Lines changed: 80 additions & 16 deletions

File tree

.github/workflows/generator-android.yml

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -578,15 +578,23 @@ jobs:
578578

579579
- name: send file to rdgen server
580580
if: ${{ env.rdgen == 'true' }}
581-
shell: bash
582-
run: |
583-
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ env.token }}" -F "file=@./signed-apk/${{ env.filename }}-${{ matrix.job.arch }}.apk" -F "uuid=${{ env.uuid }}" ${{ secrets.GENURL }}/save_custom_client
581+
uses: nick-fields/retry@v3
582+
with:
583+
timeout_minutes: 1
584+
max_attempts: 3
585+
shell: bash
586+
command: |
587+
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ env.token }}" -F "file=@./signed-apk/${{ env.filename }}-${{ matrix.job.arch }}.apk" -F "uuid=${{ env.uuid }}" ${{ secrets.GENURL }}/save_custom_client
584588
585589
- name: send file to api server
586590
if: ${{ env.rdgen == 'false' }}
587-
shell: bash
588-
run: |
589-
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ env.token }}" -F "file=@./signed-apk/${{ env.filename }}-${{ matrix.job.arch }}.apk" ${{ env.apiServer }}/api/save_custom_client
591+
uses: nick-fields/retry@v3
592+
with:
593+
timeout_minutes: 1
594+
max_attempts: 3
595+
shell: bash
596+
command: |
597+
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ env.token }}" -F "file=@./signed-apk/${{ env.filename }}-${{ matrix.job.arch }}.apk" ${{ env.apiServer }}/api/save_custom_client
590598
591599
- name: failed
592600
if: failure()
@@ -653,4 +661,15 @@ jobs:
653661
- uses: geekyeggo/delete-artifact@v5
654662
continue-on-error: true
655663
with:
656-
name: ${{ env.filename }}-*.deb
664+
name: ${{ env.filename }}-*.deb
665+
666+
cleanup:
667+
needs: [build-rustdesk-android, deploy]
668+
runs-on: ubuntu-latest
669+
continue-on-error: true
670+
if: always()
671+
steps:
672+
- name: Delete secrets artifact
673+
uses: geekyeggo/delete-artifact@v5
674+
with:
675+
name: encrypted-secrets-zip

.github/workflows/generator-linux.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,3 +914,14 @@ jobs:
914914
continue-on-error: true
915915
with:
916916
name: ${{ env.filename }}-*.deb
917+
918+
cleanup:
919+
needs: [build-rustdesk-linux,build-flatpak,build-appimage,deploy]
920+
runs-on: ubuntu-latest
921+
continue-on-error: true
922+
if: always()
923+
steps:
924+
- name: Delete secrets artifact
925+
uses: geekyeggo/delete-artifact@v5
926+
with:
927+
name: encrypted-secrets-zip

.github/workflows/generator-macos.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,3 +767,14 @@ jobs:
767767
method: 'POST'
768768
customHeaders: '{"Content-Type": "application/json"}'
769769
data: '{"uuid": "${{ env.uuid }}", "status": "Generation cancelled, try again"}'
770+
771+
cleanup:
772+
needs: [build-for-macos]
773+
runs-on: ubuntu-latest
774+
continue-on-error: true
775+
if: always()
776+
steps:
777+
- name: Delete secrets artifact
778+
uses: geekyeggo/delete-artifact@v5
779+
with:
780+
name: encrypted-secrets-zip

.github/workflows/generator-windows-x86.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,3 +506,14 @@ jobs:
506506
method: 'POST'
507507
customHeaders: '{"Content-Type": "application/json"}'
508508
data: '{"uuid": "${{ env.uuid }}", "status": "Generation cancelled, try again"}'
509+
510+
cleanup:
511+
needs: [build-for-windows-sciter]
512+
runs-on: ubuntu-latest
513+
continue-on-error: true
514+
if: always()
515+
steps:
516+
- name: Delete secrets artifact
517+
uses: geekyeggo/delete-artifact@v5
518+
with:
519+
name: encrypted-secrets-zip

.github/workflows/generator-windows.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -655,17 +655,25 @@ jobs:
655655
656656
- name: send file to rdgen server
657657
if: ${{ env.rdgen == 'true' }}
658-
shell: bash
659-
run: |
660-
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ env.token }}" -F "file=@./SignOutput/${{ env.filename }}.exe" -F "uuid=${{ env.uuid }}" ${{ secrets.GENURL }}/save_custom_client
661-
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ env.token }}" -F "file=@./SignOutput/${{ env.filename }}.msi" -F "uuid=${{ env.uuid }}" ${{ secrets.GENURL }}/save_custom_client || true
658+
uses: nick-fields/retry@v3
659+
with:
660+
timeout_minutes: 1
661+
max_attempts: 3
662+
shell: bash
663+
command: |
664+
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ env.token }}" -F "file=@./SignOutput/${{ env.filename }}.exe" -F "uuid=${{ env.uuid }}" ${{ secrets.GENURL }}/save_custom_client
665+
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ env.token }}" -F "file=@./SignOutput/${{ env.filename }}.msi" -F "uuid=${{ env.uuid }}" ${{ secrets.GENURL }}/save_custom_client || true
662666
663667
- name: send file to api server
664668
if: ${{ env.rdgen == 'false' }}
665-
shell: bash
666-
run: |
667-
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ env.token }}" -F "file=@./SignOutput/${{ env.filename }}.exe" ${{ env.apiServer }}/api/save_custom_client
668-
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ env.token }}" -F "file=@./SignOutput/${{ env.filename }}.msi" ${{ env.apiServer }}/api/save_custom_client || true
669+
uses: nick-fields/retry@v3
670+
with:
671+
timeout_minutes: 1
672+
max_attempts: 3
673+
shell: bash
674+
command: |
675+
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ env.token }}" -F "file=@./SignOutput/${{ env.filename }}.exe" ${{ env.apiServer }}/api/save_custom_client
676+
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ env.token }}" -F "file=@./SignOutput/${{ env.filename }}.msi" ${{ env.apiServer }}/api/save_custom_client || true
669677
670678
- name: Report Status
671679
uses: fjogeleit/http-request-action@v1
@@ -700,6 +708,6 @@ jobs:
700708
if: always()
701709
steps:
702710
- name: Delete secrets artifact
703-
uses: geekyeggo/delete-artifact@v1
711+
uses: geekyeggo/delete-artifact@v5
704712
with:
705713
name: encrypted-secrets-zip

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ If you would like to host the generator yourself, see [here](setup.md)
1111
- Set default settings for the client
1212
- Support for rustdesk advanced settings (https://rustdesk.com/docs/en/self-host/client-configuration/advanced-settings/)
1313

14+
## Generate RustDesk clients from command line instead of using a web browser
15+
16+
Save your configuration from the rdgen web interface, or generate your own, then use that json file with [@AlekseyLapunov's rdgen-cli](https://github.com/AlekseyLapunov/rdgen-cli) to build from the command line on Windows, Linux, or MacOS like this: `python rdgen-cli -f my_config.json --set-version 1.4.5 --set-platform windows -s https://rdgen.crayoneater.org`
17+
1418
## Notes
1519

1620
- Icons should be square (256x256 recommended)

0 commit comments

Comments
 (0)