From 30c0867e4099c02ec7d9385adf6dd83bad3d3e30 Mon Sep 17 00:00:00 2001 From: fufesou Date: Fri, 19 Jun 2026 00:10:37 +0800 Subject: [PATCH] fix(ci): win arm64 (#15333) * fix(ci): win arm64 Signed-off-by: fufesou * fix: ci, less changes Signed-off-by: fufesou --------- Signed-off-by: fufesou --- .github/workflows/flutter-build.yml | 24 +++++++++++++------ .../third-party-RustDeskTempTopMostWindow.yml | 5 ++-- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/.github/workflows/flutter-build.yml b/.github/workflows/flutter-build.yml index 6cc2900f7..364965135 100644 --- a/.github/workflows/flutter-build.yml +++ b/.github/workflows/flutter-build.yml @@ -58,14 +58,24 @@ jobs: build-RustDeskTempTopMostWindow: uses: ./.github/workflows/third-party-RustDeskTempTopMostWindow.yml - with: - upload-artifact: ${{ inputs.upload-artifact }} - target: windows-2022 - configuration: Release - platform: x64 - target_version: Windows10 strategy: fail-fast: false + matrix: + job: + - { + target: windows-2022, + platform: x64, + } + - { + target: windows-11-arm, + platform: ARM64, + } + with: + upload-artifact: ${{ inputs.upload-artifact }} + target: ${{ matrix.job.target }} + configuration: Release + platform: ${{ matrix.job.platform }} + target_version: Windows10 build-for-windows-flutter: name: ${{ matrix.job.target }} @@ -302,7 +312,7 @@ jobs: uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 if: ${{ inputs.upload-artifact }} with: - name: topmostwindow-artifacts + name: ${{ matrix.job.arch == 'aarch64' && 'topmostwindow-artifacts-ARM64' || 'topmostwindow-artifacts-x64' }} path: "./rustdesk" - name: Upload unsigned diff --git a/.github/workflows/third-party-RustDeskTempTopMostWindow.yml b/.github/workflows/third-party-RustDeskTempTopMostWindow.yml index d19b80d9e..c56ff992a 100644 --- a/.github/workflows/third-party-RustDeskTempTopMostWindow.yml +++ b/.github/workflows/third-party-RustDeskTempTopMostWindow.yml @@ -45,16 +45,15 @@ jobs: run: | git clone https://github.com/rustdesk-org/RustDeskTempTopMostWindow RustDeskTempTopMostWindow - # Build. commit 3b79772afb754a5a1111804864616c2e81513de8, support multiple monitors - name: Build the project run: | - cd RustDeskTempTopMostWindow && git checkout 3b79772afb754a5a1111804864616c2e81513de8 + cd RustDeskTempTopMostWindow && git checkout c7b45f3eaa7ad433b7ccc9d860ec798367dbef41 msbuild ${{ env.project_path }} -p:Configuration=${{ inputs.configuration }} -p:Platform=${{ inputs.platform }} /p:TargetVersion=${{ inputs.target_version }} - name: Archive build artifacts uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 if: ${{ inputs.upload-artifact }} with: - name: topmostwindow-artifacts + name: topmostwindow-artifacts-${{ inputs.platform }} path: | ./${{ env.build_output_dir }}/WindowInjection.dll