From a45bc0acddfa4366b7d83c098ffd43fdf1d37afa Mon Sep 17 00:00:00 2001 From: Bryan Gerlach Date: Fri, 18 Apr 2025 20:58:18 -0500 Subject: [PATCH] macos stuff --- .github/workflows/generator-macos.yml | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/.github/workflows/generator-macos.yml b/.github/workflows/generator-macos.yml index 9dac29e..e3e51cc 100644 --- a/.github/workflows/generator-macos.yml +++ b/.github/workflows/generator-macos.yml @@ -119,16 +119,6 @@ jobs: core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || ''); core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || ''); - # - name: Set rdgen value - # if: ${{ fromJson(inputs.extras).rdgen == 'true' }} - # run: | - # echo "STATUS_URL=${{ secrets.GENURL }}/updategh" >> GITHUB_ENV - - # - name: Set rdgen value - # if: ${{ fromJson(inputs.extras).rdgen == 'false' }} - # run: | - # echo "STATUS_URL=${{ inputs.apiServer }}/api/updategh" >> GITHUB_ENV - - name: Check GITHUB_ENV contents run: cat $GITHUB_ENV @@ -266,18 +256,16 @@ jobs: data: '{"uuid": "${{ inputs.uuid }}", "status": "10% complete"}' - name: Install flutter - uses: subosito/flutter-action@v2.12.0 + uses: subosito/flutter-action@v2 with: channel: "stable" flutter-version: ${{ env.FLUTTER_VERSION }} - cache: true - name: Patch flutter continue-on-error: true run: | - cp .github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff $(dirname $(dirname $(which flutter))) cd $(dirname $(dirname $(which flutter))) - [[ "3.24.4" == 3.24.5 ]] && git apply flutter_3.24.4_dropdown_menu_enableFilter.diff + [[ "3.24.5" == ${{env.FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff - name: Workaround for flutter issue shell: bash @@ -536,6 +524,11 @@ jobs: - name: Build rustdesk run: | + MIN_MACOS_VERSION="10.14" + sed -i -e "s/MACOSX_DEPLOYMENT_TARGET\=[0-9]*.[0-9]*/MACOSX_DEPLOYMENT_TARGET=${MIN_MACOS_VERSION}/" build.py + sed -i -e "s/platform :osx, '.*'/platform :osx, '${MIN_MACOS_VERSION}'/" flutter/macos/Podfile + sed -i -e "s/osx_minimum_system_version = \"[0-9]*.[0-9]*\"/osx_minimum_system_version = \"${MIN_MACOS_VERSION}\"/" Cargo.toml + sed -i -e "s/MACOSX_DEPLOYMENT_TARGET = [0-9]*.[0-9]*;/MACOSX_DEPLOYMENT_TARGET = ${MIN_MACOS_VERSION};/" flutter/macos/Runner.xcodeproj/project.pbxproj if [ "${{ matrix.job.target }}" = "aarch64-apple-darwin" ]; then MIN_MACOS_VERSION="12.3" sed -i -e "s/MACOSX_DEPLOYMENT_TARGET\=[0-9]*.[0-9]*/MACOSX_DEPLOYMENT_TARGET=${MIN_MACOS_VERSION}/" build.py @@ -544,7 +537,7 @@ jobs: sed -i -e "s/MACOSX_DEPLOYMENT_TARGET = [0-9]*.[0-9]*;/MACOSX_DEPLOYMENT_TARGET = ${MIN_MACOS_VERSION};/" flutter/macos/Runner.xcodeproj/project.pbxproj fi sed -i -e "s/RustDesk.app/\"${{ inputs.appname }}.app\"/" build.py - ./build.py --flutter --hwcodec ${{ matrix.job.extra-build-args }} + ./build.py --flutter --hwcodec --unix-file-copy-paste ${{ matrix.job.extra-build-args }} # - name: Copy service file # run: |