Skip to content

Commit a45bc0a

Browse files
committed
macos stuff
1 parent 5ea49e7 commit a45bc0a

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

.github/workflows/generator-macos.yml

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,6 @@ jobs:
119119
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
120120
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
121121
122-
# - name: Set rdgen value
123-
# if: ${{ fromJson(inputs.extras).rdgen == 'true' }}
124-
# run: |
125-
# echo "STATUS_URL=${{ secrets.GENURL }}/updategh" >> GITHUB_ENV
126-
127-
# - name: Set rdgen value
128-
# if: ${{ fromJson(inputs.extras).rdgen == 'false' }}
129-
# run: |
130-
# echo "STATUS_URL=${{ inputs.apiServer }}/api/updategh" >> GITHUB_ENV
131-
132122
- name: Check GITHUB_ENV contents
133123
run: cat $GITHUB_ENV
134124

@@ -266,18 +256,16 @@ jobs:
266256
data: '{"uuid": "${{ inputs.uuid }}", "status": "10% complete"}'
267257

268258
- name: Install flutter
269-
uses: subosito/flutter-action@v2.12.0
259+
uses: subosito/flutter-action@v2
270260
with:
271261
channel: "stable"
272262
flutter-version: ${{ env.FLUTTER_VERSION }}
273-
cache: true
274263

275264
- name: Patch flutter
276265
continue-on-error: true
277266
run: |
278-
cp .github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff $(dirname $(dirname $(which flutter)))
279267
cd $(dirname $(dirname $(which flutter)))
280-
[[ "3.24.4" == 3.24.5 ]] && git apply flutter_3.24.4_dropdown_menu_enableFilter.diff
268+
[[ "3.24.5" == ${{env.FLUTTER_VERSION}} ]] && git apply ${{ github.workspace }}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff
281269
282270
- name: Workaround for flutter issue
283271
shell: bash
@@ -536,6 +524,11 @@ jobs:
536524
537525
- name: Build rustdesk
538526
run: |
527+
MIN_MACOS_VERSION="10.14"
528+
sed -i -e "s/MACOSX_DEPLOYMENT_TARGET\=[0-9]*.[0-9]*/MACOSX_DEPLOYMENT_TARGET=${MIN_MACOS_VERSION}/" build.py
529+
sed -i -e "s/platform :osx, '.*'/platform :osx, '${MIN_MACOS_VERSION}'/" flutter/macos/Podfile
530+
sed -i -e "s/osx_minimum_system_version = \"[0-9]*.[0-9]*\"/osx_minimum_system_version = \"${MIN_MACOS_VERSION}\"/" Cargo.toml
531+
sed -i -e "s/MACOSX_DEPLOYMENT_TARGET = [0-9]*.[0-9]*;/MACOSX_DEPLOYMENT_TARGET = ${MIN_MACOS_VERSION};/" flutter/macos/Runner.xcodeproj/project.pbxproj
539532
if [ "${{ matrix.job.target }}" = "aarch64-apple-darwin" ]; then
540533
MIN_MACOS_VERSION="12.3"
541534
sed -i -e "s/MACOSX_DEPLOYMENT_TARGET\=[0-9]*.[0-9]*/MACOSX_DEPLOYMENT_TARGET=${MIN_MACOS_VERSION}/" build.py
@@ -544,7 +537,7 @@ jobs:
544537
sed -i -e "s/MACOSX_DEPLOYMENT_TARGET = [0-9]*.[0-9]*;/MACOSX_DEPLOYMENT_TARGET = ${MIN_MACOS_VERSION};/" flutter/macos/Runner.xcodeproj/project.pbxproj
545538
fi
546539
sed -i -e "s/RustDesk.app/\"${{ inputs.appname }}.app\"/" build.py
547-
./build.py --flutter --hwcodec ${{ matrix.job.extra-build-args }}
540+
./build.py --flutter --hwcodec --unix-file-copy-paste ${{ matrix.job.extra-build-args }}
548541
549542
# - name: Copy service file
550543
# run: |

0 commit comments

Comments
 (0)