From dc3454358e9bc35b0aff29be36ad5de4d4807acf Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Sat, 16 Nov 2024 20:54:09 -0600 Subject: [PATCH] fix windows generator --- .github/workflows/generator-windows.yml | 35 +++++-------------------- 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/.github/workflows/generator-windows.yml b/.github/workflows/generator-windows.yml index 74f19f4..1781f51 100644 --- a/.github/workflows/generator-windows.yml +++ b/.github/workflows/generator-windows.yml @@ -155,6 +155,12 @@ jobs: with: repository: rustdesk/rustdesk + - name: Restore bridge files + uses: actions/download-artifact@master + with: + name: bridge-artifact + path: ./ + - name: Install ImageMagick on Windows run: | choco install -y imagemagick.app --no-progress @@ -247,13 +253,6 @@ jobs: - uses: Swatinem/rust-cache@v2 with: prefix-key: ${{ matrix.job.os }} - - - name: Install flutter rust bridge deps - run: | - git config --global core.longpaths true - cargo install flutter_rust_bridge_codegen --version ${{ env.FLUTTER_RUST_BRIDGE_VERSION }} --features "uuid" - Push-Location flutter ; flutter pub get ; Pop-Location - ~/.cargo/bin/flutter_rust_bridge_codegen --rust-input ./src/flutter_ffi.rs --dart-output ./flutter/lib/generated_bridge.dart - name: Report Status uses: fjogeleit/http-request-action@v1 @@ -355,18 +354,6 @@ jobs: flutter pub run flutter_launcher_icons cd .. - - name: Report Status - uses: fjogeleit/http-request-action@v1 - with: - url: ${{ env.STATUS_URL }} - method: 'POST' - customHeaders: '{"Content-Type": "application/json"}' - data: '{"uuid": "${{ inputs.uuid }}", "status": "30% complete"}' - - # - name: generate rustbridge - # run: | - # ~/.cargo/bin/flutter_rust_bridge_codegen --rust-input ./src/flutter_ffi.rs --dart-output ./flutter/lib/generated_bridge.dart - - name: Report Status uses: fjogeleit/http-request-action@v1 with: @@ -383,15 +370,7 @@ jobs: Remove-Item -Path usbmmidd_v2\Win32 -Recurse Remove-Item -Path "usbmmidd_v2\deviceinstaller64.exe", "usbmmidd_v2\deviceinstaller.exe", "usbmmidd_v2\usbmmidd.bat" mv ./flutter/build/windows/x64/runner/Release ./rustdesk - mv -Force .\usbmmidd_v2 ./rustdesk - - # - name: logo stuff - # if: ${{ inputs.logolink != 'false' }} - # continue-on-error: true - # shell: bash - # run: | - # #echo "${{ inputs.logobase64 }}" | base64 -d > ./rustdesk/data/flutter_assets/assets/logo.png - + mv -Force .\usbmmidd_v2 ./rustdesk - name: icon stuff if: ${{ inputs.iconlink != 'false' }}