From b26ddd0a54853cb10e19d273861af9ae2d57a4c1 Mon Sep 17 00:00:00 2001 From: "Alex (Yowie IT MSP)" Date: Sat, 2 May 2026 22:06:59 +1000 Subject: [PATCH] ci: rewrite workflow cleanly (sed mangled previous commit) --- .gitea/workflows/build.yml | 42 +++++++++++++++----------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index bc1818919..30ad35692 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -1,20 +1,12 @@ -# Yowie IT — RustDesk patched-binary build pipeline +# Yowie IT - RustDesk patched-binary build pipeline # ===================================================================== -# Source-of-truth build for the Yowie IT-patched rustdesk.exe (always- -# emit-cursor variant for #672 server endpoint headless cursor fix). +# Builds the Sciter-UI rustdesk.exe with our get_cursor() patch for +# upstream issue #672 (always emit cursor data on Windows endpoints +# regardless of physical mouse presence). # -# Triggers: push to yowie-master, manual dispatch. -# Runs on: self-hosted Windows runner (yowie-admin-pc) registered with -# git.yowieit.com — see CHANGELOG 2026-05-02. -# -# Toolchain version pins (match rustdesk upstream CI exactly): -# - LLVM 16.0.0 (rustdesk's LLVM_VERSION) -# - vcpkg @ 120deac3062162151622ca4860575a33844ba10b -# - Rust stable -# -# Output artifact: rustdesk.exe (~50 MB) attached to a Gitea release -# tagged build-${{ github.sha }}. OnRamp's Install-RustDeskClient -# downloads from this release URL. +# Self-hosted Windows runner: yowie-admin-pc. +# Toolchain version pins match upstream rustdesk CI (LLVM 16.0.0, vcpkg +# at 120deac3, Rust stable). name: Build patched rustdesk.exe @@ -26,6 +18,7 @@ on: env: LLVM_VERSION: "16.0.0" VCPKG_COMMIT_ID: "120deac3062162151622ca4860575a33844ba10b" + CARGO_BIN: "C:\Users\Yowie\.cargo\bin" jobs: build: @@ -40,10 +33,10 @@ jobs: - name: Verify Rust toolchain shell: powershell run: | - rustc --version "C:SERSYOWIE.CARGOBIN USTC.EXE" --VERSION - cargo --version "C:SERSYOWIE.CARGOBINRGO.EXE" --VERSION + & "$env:CARGO_BIN\rustc.exe" --version + & "$env:CARGO_BIN\cargo.exe" --version - - name: Setup LLVM ${{ env.LLVM_VERSION }} (pinned, matches upstream rustdesk CI) + - name: Setup LLVM 16 (matches upstream rustdesk CI) shell: powershell run: | if (-not (Test-Path 'C:\LLVM16\bin\libclang.dll')) { @@ -58,7 +51,7 @@ jobs: echo "LIBCLANG_PATH=C:\LLVM16\bin" >> $env:GITHUB_ENV echo "C:\LLVM16\bin" >> $env:GITHUB_PATH - - name: Setup vcpkg @ pinned commit ${{ env.VCPKG_COMMIT_ID }} + - name: Setup vcpkg pinned commit shell: powershell run: | if (-not (Test-Path 'C:\vcpkg\vcpkg.exe')) { @@ -72,29 +65,28 @@ jobs: echo "VCPKG_ROOT=C:\vcpkg" >> $env:GITHUB_ENV echo "C:\vcpkg" >> $env:GITHUB_PATH - - name: Install vcpkg native deps (libvpx libyuv opus aom libjpeg-turbo, x64-windows-static) + - name: Install vcpkg native deps shell: powershell run: | C:\vcpkg\vcpkg.exe install --triplet x64-windows-static libvpx libyuv opus aom libjpeg-turbo - - name: cargo build "C:SERSYOWIE.CARGOBINRGO.EXE" BUILD --release (Sciter UI, no flutter, no hwcodec) + - name: cargo build --release (Sciter UI) shell: powershell run: | - cargo build "C:SERSYOWIE.CARGOBINRGO.EXE" BUILD --release --no-default-features --features inline + & "$env:CARGO_BIN\cargo.exe" build --release --no-default-features --features inline - - name: Verify binary + show patch line is in built source + - name: Verify binary + patch marker shell: powershell run: | $exe = "target\release\rustdesk.exe" if (-not (Test-Path $exe)) { throw "rustdesk.exe not produced" } $size = (Get-Item $exe).Length Write-Output "rustdesk.exe size: $size bytes" - # Confirm our patch comment is in the source if (-not (Select-String -Path "src\platform\windows.rs" -Pattern "Yowie IT MSP fork" -Quiet)) { throw "patch marker missing from src\platform\windows.rs" } - - name: Upload patched rustdesk.exe artifact + - name: Upload artifact uses: actions/upload-artifact@v3 with: name: rustdesk-yowie-windows-x64