From 2ab2b54f660f7554c90a5fae85e80c7122256930 Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Thu, 12 Feb 2026 12:41:33 -0600 Subject: [PATCH] vcpkg --- .github/workflows/generator-windows-x86.yml | 4 ++-- .github/workflows/generator-windows.yml | 4 ++-- .github/workflows/vcpkg.yml | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/generator-windows-x86.yml b/.github/workflows/generator-windows-x86.yml index 5153caa..a62673e 100644 --- a/.github/workflows/generator-windows-x86.yml +++ b/.github/workflows/generator-windows-x86.yml @@ -351,7 +351,7 @@ jobs: url: ${{ env.STATUS_URL }} method: 'POST' customHeaders: '{"Content-Type": "application/json"}' - data: '{"uuid": "${{ env.uuid }}", "status": "50% complete, this step takes about 5 minutes, be patient."}' + data: '{"uuid": "${{ env.uuid }}", "status": "50% complete"}' - name: Build rustdesk id: build @@ -396,7 +396,7 @@ jobs: url: ${{ env.STATUS_URL }} method: 'POST' customHeaders: '{"Content-Type": "application/json"}' - data: '{"uuid": "${{ env.uuid }}", "status": "70% complete, this step takes about 5 minutes, be patient."}' + data: '{"uuid": "${{ env.uuid }}", "status": "70% complete"}' - name: zip dlls continue-on-error: true diff --git a/.github/workflows/generator-windows.yml b/.github/workflows/generator-windows.yml index b14d866..f07b431 100644 --- a/.github/workflows/generator-windows.yml +++ b/.github/workflows/generator-windows.yml @@ -475,7 +475,7 @@ jobs: url: ${{ env.STATUS_URL }} method: 'POST' customHeaders: '{"Content-Type": "application/json"}' - data: '{"uuid": "${{ env.uuid }}", "status": "50% complete, this step takes about 5 minutes, be patient."}' + data: '{"uuid": "${{ env.uuid }}", "status": "50% complete"}' - name: Build rustdesk run: | @@ -565,7 +565,7 @@ jobs: url: ${{ env.STATUS_URL }} method: 'POST' customHeaders: '{"Content-Type": "application/json"}' - data: '{"uuid": "${{ env.uuid }}", "status": "70% complete, this step takes about 5 minutes, be patient."}' + data: '{"uuid": "${{ env.uuid }}", "status": "70% complete"}' - name: zip dlls continue-on-error: true diff --git a/.github/workflows/vcpkg.yml b/.github/workflows/vcpkg.yml index bfb394d..83194b9 100644 --- a/.github/workflows/vcpkg.yml +++ b/.github/workflows/vcpkg.yml @@ -35,11 +35,10 @@ jobs: run: | git clone --filter=blob:none --sparse https://github.com/rustdesk/rustdesk.git rustdesk_repo cd rustdesk_repo - # Added vcpkg-configuration.json to the list - git sparse-checkout set res/vcpkg vcpkg.json vcpkg-configuration.json + git sparse-checkout set res/vcpkg + git checkout master -- vcpkg.json vcpkg-configuration.json || git checkout main -- vcpkg.json vcpkg-configuration.json cd .. cp rustdesk_repo/vcpkg.json . - # Copy configuration if it exists [ -f rustdesk_repo/vcpkg-configuration.json ] && cp rustdesk_repo/vcpkg-configuration.json . mkdir -p res cp -r rustdesk_repo/res/vcpkg ./res/