diff --git a/.github/workflows/generator-linux.yml b/.github/workflows/generator-linux.yml index b7af3c1..066c093 100644 --- a/.github/workflows/generator-linux.yml +++ b/.github/workflows/generator-linux.yml @@ -70,7 +70,7 @@ env: VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" # vcpkg version: 2024.07.12 VCPKG_COMMIT_ID: "1de2026f28ead93ff1773e6e680387643e914ea1" - VERSION: "1.3.1" + VERSION: ${{ fromJson(inputs.extras).version }} NDK_VERSION: "r27" #signing keys env variable checks ANDROID_SIGNING_KEY: "${{ secrets.ANDROID_SIGNING_KEY }}" @@ -141,6 +141,7 @@ jobs: uses: actions/checkout@v4 with: repository: rustdesk/rustdesk + ref: refs/tags/${{ env.VERSION }} - name: Set Swap Space if: ${{ matrix.job.arch == 'x86_64' }} @@ -289,8 +290,8 @@ jobs: - name: icon stuff continue-on-error: true run: | - mv ./rustdesk/data/flutter_assets/assets/icon.svg ./rustdesk/data/flutter_assets/assets/icon.svg.bak - magick ./res/icon.png ./rustdesk/data/flutter_assets/assets/icon.svg + #mv ./rustdesk/data/flutter_assets/assets/icon.svg ./rustdesk/data/flutter_assets/assets/icon.svg.bak + convert ./res/icon.png ./rustdesk/data/flutter_assets/assets/icon.svg - uses: rustdesk-org/run-on-arch-action@amd64-support name: Build rustdesk @@ -420,6 +421,10 @@ jobs: chmod 777 output -R export CARGO_INCREMENTAL=0 export DEB_ARCH=${{ matrix.job.deb_arch }} + echo "$(ls)" + echo "${{ inputs.logobase64 }}" | base64 -d > ./rustdesk/data/flutter_assets/assets/logo.png + mv ./rustdesk/data/flutter_assets/assets/icon.svg ./rustdesk/data/flutter_assets/assets/icon.svg.bak + convert ./res/icon.png ./rustdesk/data/flutter_assets/assets/icon.svg pushd ./flutter flutter pub run flutter_launcher_icons popd diff --git a/.github/workflows/generator-windows.yml b/.github/workflows/generator-windows.yml index fe37995..bf2cd4d 100644 --- a/.github/workflows/generator-windows.yml +++ b/.github/workflows/generator-windows.yml @@ -71,7 +71,7 @@ env: VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite" # vcpkg version: 2024.07.12 VCPKG_COMMIT_ID: "1de2026f28ead93ff1773e6e680387643e914ea1" - VERSION: "1.3.1" + VERSION: ${{ fromJson(inputs.extras).version }} NDK_VERSION: "r27" #signing keys env variable checks ANDROID_SIGNING_KEY: "${{ secrets.ANDROID_SIGNING_KEY }}" @@ -135,7 +135,7 @@ jobs: uses: actions/checkout@v4 with: repository: rustdesk/rustdesk - ref: refs/tags/1.3.1 + ref: refs/tags/${{ env.VERSION }} # - name: Install LLVM and Clang # uses: KyleMayes/install-llvm-action@v1 diff --git a/rdgenerator/forms.py b/rdgenerator/forms.py index 1c40c9f..e07ecb0 100644 --- a/rdgenerator/forms.py +++ b/rdgenerator/forms.py @@ -3,6 +3,7 @@ from django import forms class GenerateForm(forms.Form): #Platform platform = forms.ChoiceField(choices=[('windows','Windows'),('linux','Linux (currently unavailable)'),('android','Android (testing now available)')], initial='windows') + version = forms.ChoiceField(choices=[('master','beta'),('1.3.1,','1.3.1'),('1.3.0','1.3.0')], initial='1.3.1') delayFix = forms.BooleanField(initial=True, required=False) #General diff --git a/rdgenerator/templates/generator.html b/rdgenerator/templates/generator.html index f8423be..6c49da3 100644 --- a/rdgenerator/templates/generator.html +++ b/rdgenerator/templates/generator.html @@ -123,6 +123,8 @@ + + {{ form.version }} diff --git a/rdgenerator/views.py b/rdgenerator/views.py index 9d9843c..159045d 100644 --- a/rdgenerator/views.py +++ b/rdgenerator/views.py @@ -19,6 +19,7 @@ def generator_view(request): form = GenerateForm(request.POST, request.FILES) if form.is_valid(): platform = form.cleaned_data['platform'] + version = form.cleaned_data['version'] delayFix = form.cleaned_data['delayFix'] server = form.cleaned_data['serverIP'] key = form.cleaned_data['key'] @@ -143,6 +144,7 @@ def generator_view(request): extras['runasadmin'] = runasadmin extras['urlLink'] = urlLink extras['delayFix'] = 'true' if delayFix else 'false' + extras['version'] = version extra_input = json.dumps(extras) ####from here run the github action, we need user, repo, access token.