paulmataruso/rdgen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding msi package

Browse Source
This commit is contained in:
Bryan Gerlach
2025-01-09 21:27:45 -06:00
parent ae98623457
commit 66265d7e18
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
.github/workflows/generator-windows.yml vendored
View File

@@ -508,19 +508,19 @@ jobs:
mkdir -p ./SignOutput
mv ./target/release/rustdesk-portable-packer.exe "./SignOutput/rustdesk.exe"
# - name: Add MSBuild to PATH
# uses: microsoft/setup-msbuild@v2
- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v2
# - name: Build msi
# if: env.UPLOAD_ARTIFACT == 'true'
# run: |
# pushd ./res/msi
# python preprocess.py --arp -d ../../rustdesk
# nuget restore msi.sln
# msbuild msi.sln -p:Configuration=Release -p:Platform=x64 /p:TargetVersion=Windows10
# cp ./Package/bin/x64/Release/en-us/Package.msi ../../SignOutput/rustdesk-latest.msi
# mv ./Package/bin/x64/Release/en-us/Package.msi ../../SignOutput/rustdesk-${{ env.VERSION }}-${{ matrix.job.arch }}.msi
# sha256sum ../../SignOutput/rustdesk-*.msi
- name: Build msi
if: env.UPLOAD_ARTIFACT == 'true'
run: |
pushd ./res/msi
python preprocess.py --arp -d ../../rustdesk
nuget restore msi.sln
msbuild msi.sln -p:Configuration=Release -p:Platform=x64 /p:TargetVersion=Windows10
cp ./Package/bin/x64/Release/en-us/Package.msi ../../SignOutput/rustdesk-latest.msi
mv ./Package/bin/x64/Release/en-us/Package.msi ../../SignOutput/rustdesk.msi
sha256sum ../../SignOutput/rustdesk.msi
# - name: Sign rustdesk self-extracted file
# if: env.UPLOAD_ARTIFACT == 'true' && env.SIGN_BASE_URL != ''
@@ -560,6 +560,7 @@ jobs:
- name: rename rustdesk.exe to filename.exe
run: |
mv ./SignOutput/rustdesk.exe "./SignOutput/${{ inputs.filename }}.exe" || echo "rustdesk"
mv ./SignOutput/rustdesk.msi "./SignOutput/${{ inputs.filename }}.msi" || echo "rustdesk"
# - name: Upload to FTP
# if: ${{ fromJson(inputs.extras).rdgen == 'true' }}
@@ -575,12 +576,14 @@ jobs:
shell: bash
run: |
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ fromJson(inputs.extras).token }}" -F "file=@./SignOutput/${{ inputs.filename }}.exe" -F "uuid=${{ inputs.uuid }}" ${{ secrets.GENURL }}/save_custom_client
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ fromJson(inputs.extras).token }}" -F "file=@./SignOutput/${{ inputs.filename }}.msi" -F "uuid=${{ inputs.uuid }}" ${{ secrets.GENURL }}/save_custom_client
- name: send file to api server
if: ${{ fromJson(inputs.extras).rdgen == 'false' }}
shell: bash
run: |
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ fromJson(inputs.extras).token }}" -F "file=@./SignOutput/${{ inputs.filename }}.exe" ${{ inputs.apiServer }}/api/save_custom_client
curl -i -X POST -H "Content-Type: multipart/form-data" -H "Authorization: Bearer ${{ fromJson(inputs.extras).token }}" -F "file=@./SignOutput/${{ inputs.filename }}.msi" ${{ inputs.apiServer }}/api/save_custom_client
- name: Report Status
uses: fjogeleit/http-request-action@v1

1
rdgenerator/templates/generated.html
View File

@@ -128,6 +128,7 @@
<div class="download-section">
{% if platform == 'windows' %}
<a href='/download?filename={{filename}}.exe&uuid={{uuid}}' class="download-link">Download {{filename}}.exe</a>
<a href='/download?filename={{filename}}.exe&uuid={{uuid}}' class="download-link">Download {{filename}}.msi</a>
{% elif platform == 'linux' %}
<a href='/download?filename={{filename}}.deb&uuid={{uuid}}' class="download-link">Download {{filename}}.deb</a>
<a href='/download?filename={{filename}}.rpm&uuid={{uuid}}' class="download-link">Download {{filename}}.rpm</a>