From 53de01755b2d048a0dc81231426de8f07e2f0195 Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Thu, 23 Jan 2025 11:49:05 -0600 Subject: [PATCH] macos changes --- .github/workflows/generator-macos.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generator-macos.yml b/.github/workflows/generator-macos.yml index 9ccbf3e..211e332 100644 --- a/.github/workflows/generator-macos.yml +++ b/.github/workflows/generator-macos.yml @@ -99,6 +99,13 @@ jobs: fail-fast: false matrix: job: + - { + target: x86_64-apple-darwin, + os: macos-13, #macos-latest or macos-14 use M1 now, https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#:~:text=14%20GB-,macos%2Dlatest%20or%20macos%2D14,-The%20macos%2Dlatestlabel + extra-build-args: "", + arch: x86_64, + vcpkg-triplet: x64-osx, + } - { target: aarch64-apple-darwin, os: macos-latest, @@ -134,8 +141,6 @@ jobs: customHeaders: '{"Content-Type": "application/json"}' data: '{"uuid": "${{ inputs.uuid }}", "status": "5% complete"}' - - - name: Checkout source code if: ${{ env.VERSION != 'master' }} uses: actions/checkout@v4 @@ -525,6 +530,10 @@ jobs: customHeaders: '{"Content-Type": "application/json"}' data: '{"uuid": "${{ inputs.uuid }}", "status": "25% complete"}' + - name: Create MacOS directory structure + run: | + mkdir -p ./build/macos/Build/Products/Release/RustDesk.app/Contents/MacOS + - name: Build rustdesk run: | if [ "${{ matrix.job.target }}" = "aarch64-apple-darwin" ]; then @@ -536,6 +545,10 @@ jobs: fi ./build.py --flutter --hwcodec ${{ matrix.job.extra-build-args }} + - name: Copy service file + run: | + cp -rf ../target/release/service ./build/macos/Build/Products/Release/RustDesk.app/Contents/MacOS/ + - name: Report Status uses: fjogeleit/http-request-action@v1 with: