mirror of
https://github.com/rustdesk/rustdesk.git
synced 2026-11-10 19:00:53 +08:00
* fix(ci): build macOS arm64 with Flutter 3.44 Flutter 3.24.5's macOS engine can crash in attributedSubstringForProposedRange with an out-of-bounds range on an empty string (#16817). The fix (flutter/flutter#153157) landed after 3.24 and was never cherry-picked, and 3.44 has the bounds check. So macOS arm64 now builds with Flutter 3.44.9, the same way Windows arm64 does: the 3.44 bridge artifact and the shared source patch script. The script uses GNU `sed -i`, which BSD sed on macOS rejects, so the step puts GNU sed first on PATH. The 3.24 dropdown patch is skipped, because 3.44 already has that fix. macOS x86_64 stays on 3.24.5: 3.44's FlutterMacOS needs macOS 10.15 there, and the build targets 10.14. The Dart tests move to the x86_64 job, so CI still runs them against the 3.24.5 sources that most platforms ship. Refs #16817 Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(ci): keep CocoaPods on macOS arm64 and run Dart tests on both arches Flutter 3.44 turns on Swift Package Manager by default. On the first `flutter build macos` it would migrate Runner.xcodeproj and Runner.xcscheme, and build file_selector_macos, path_provider_foundation, url_launcher_macos and video_player_avfoundation through SwiftPM while the other 12 plugins stay on CocoaPods. If the migration fails, the build fails. All 16 macOS plugins still ship a podspec, so turning SwiftPM off keeps arm64 on the CocoaPods-only path the 3.24.5 build uses, and this change only swaps the engine. The Dart tests now run on both macOS jobs: x86_64 covers the 3.24.5 sources most platforms ship, and arm64 covers the patched 3.44 sources it ships. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * ci: update comments that still call Windows arm64 the only Flutter 3.44 build The FLUTTER_WINDOWS_ARM_VERSION note, the Windows source-patch step and the header of apply_flutter_3.44_source_patches.sh still said Windows arm64 is the only Flutter 3.44 target. They now mention macOS arm64 too, and the script header records that macOS needs GNU sed for its `sed -i` calls. Comments only. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test: make test_RustDesk_interval_sleep deterministic The test recorded tick times as wall-clock seconds, rounded to the nearest second, and asserted all 5 were unique. If the runner stalled for close to a second, two correct ticks rounded to the same value and the test failed (macOS arm64 CI on #16821: left 5, right 4). It now runs on tokio's paused clock and checks what ThrottledInterval guarantees: ticks are at least 0.9 * period apart. A plain tokio interval bursts its missed ticks with no gap, so a lost throttle still fails. This needs tokio's test-util feature for the existing dev-dependency. It adds no crates, so Cargo.lock is unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
144 lines
6.5 KiB
Bash
144 lines
6.5 KiB
Bash
#!/usr/bin/env bash
|
|
# Applies the Flutter 3.44-only source/pubspec changes on the fly, in CI only.
|
|
#
|
|
# Windows arm64 needs Flutter >= 3.44 (the first stable release shipping an arm64 Dart SDK +
|
|
# engine), and macOS arm64 builds with 3.44 for its NSTextInputContext crash fix
|
|
# (https://github.com/rustdesk/rustdesk/issues/16817). 3.44 renamed DialogTheme/TabBarTheme ->
|
|
# *Data and needs newer extended_text/google_fonts. Every other platform is still on Flutter
|
|
# 3.24.5, where the old names/versions are required, so these changes are kept OUT of the
|
|
# committed sources and applied here instead.
|
|
#
|
|
# Used by BOTH arm64 builds (flutter-build.yml) and their shared bridge artifact (bridge.yml) so
|
|
# they share an identical 3.44 source state -- the generated *.freezed.dart must compile against
|
|
# the same Flutter/freezed version the arm64 builds resolve.
|
|
#
|
|
# Remove this script (and commit the changes) once upstream bumps Flutter across the board.
|
|
#
|
|
# Run from the repository root. sed is used (not a git-apply patch) because the checked-out
|
|
# sources are CRLF on the windows-11-arm runner; the substitutions below are anchor-free and
|
|
# therefore CRLF-safe. The calls are GNU sed (`sed -i` without a suffix); the macOS arm64 job
|
|
# puts GNU sed first on PATH because BSD sed rejects them.
|
|
set -euo pipefail
|
|
|
|
readonly NO_MATCHES=0
|
|
readonly SINGLE_MATCH=1
|
|
readonly THEME_MATCHES=2
|
|
|
|
has_exact_count() {
|
|
local -r expected_count="$1"
|
|
local -r pattern="$2"
|
|
local -r file="$3"
|
|
local actual_count
|
|
[[ -r "$file" ]] || return 1
|
|
actual_count="$(grep -cF "$pattern" "$file" || true)"
|
|
[[ "$actual_count" -eq "$expected_count" ]]
|
|
}
|
|
|
|
# The target background-color line must directly follow DialogThemeData in the selected range.
|
|
has_dialog_background_in_theme_range() {
|
|
local -r start_pattern="$1"
|
|
local -r end_pattern="$2"
|
|
local -r target_pattern="$3"
|
|
local -r file="$4"
|
|
awk -v start_pattern="$start_pattern" \
|
|
-v end_pattern="$end_pattern" \
|
|
-v target_pattern="$target_pattern" '
|
|
index($0, start_pattern) {
|
|
in_theme = 1
|
|
next
|
|
}
|
|
in_theme && index($0, end_pattern) {
|
|
exit
|
|
}
|
|
in_theme && index($0, "dialogTheme: DialogThemeData(") {
|
|
if (getline > 0) {
|
|
line = $0
|
|
sub(/\r$/, "", line)
|
|
sub(/^[[:space:]]+/, "", line)
|
|
matched = line == target_pattern
|
|
}
|
|
exit
|
|
}
|
|
END {
|
|
exit matched ? 0 : 1
|
|
}
|
|
' "$file"
|
|
}
|
|
|
|
validate_patch_inputs() {
|
|
if [[ ! -f flutter/lib/common.dart || ! -r flutter/lib/common.dart ]]; then
|
|
echo "Flutter 3.44 source patch input is missing or unreadable: flutter/lib/common.dart" >&2
|
|
return 1
|
|
fi
|
|
if [[ ! -f flutter/pubspec.yaml || ! -r flutter/pubspec.yaml ]]; then
|
|
echo "Flutter 3.44 source patch input is missing or unreadable: flutter/pubspec.yaml" >&2
|
|
return 1
|
|
fi
|
|
}
|
|
|
|
is_complete_patch_state() {
|
|
has_exact_count "$THEME_MATCHES" 'dialogTheme: DialogThemeData(' flutter/lib/common.dart &&
|
|
has_exact_count "$THEME_MATCHES" 'tabBarTheme: const TabBarThemeData(' flutter/lib/common.dart &&
|
|
has_exact_count "$SINGLE_MATCH" 'backgroundColor: Colors.white,' flutter/lib/common.dart &&
|
|
has_exact_count "$SINGLE_MATCH" 'backgroundColor: Color(0xFF18191E),' flutter/lib/common.dart &&
|
|
has_exact_count "$SINGLE_MATCH" 'extended_text: 15.0.2' flutter/pubspec.yaml &&
|
|
has_exact_count "$SINGLE_MATCH" 'google_fonts: ^8.1.0' flutter/pubspec.yaml &&
|
|
has_exact_count "$NO_MATCHES" 'dialogTheme: DialogTheme(' flutter/lib/common.dart &&
|
|
has_exact_count "$NO_MATCHES" 'tabBarTheme: const TabBarTheme(' flutter/lib/common.dart &&
|
|
has_exact_count "$NO_MATCHES" 'extended_text: 14.0.0' flutter/pubspec.yaml &&
|
|
has_exact_count "$NO_MATCHES" 'google_fonts: ^6.2.1' flutter/pubspec.yaml &&
|
|
has_dialog_background_in_theme_range 'static ThemeData lightTheme = ThemeData(' \
|
|
'static ThemeData darkTheme = ThemeData(' 'backgroundColor: Colors.white,' \
|
|
flutter/lib/common.dart &&
|
|
has_dialog_background_in_theme_range 'static ThemeData darkTheme = ThemeData(' \
|
|
'scrollbarTheme: scrollbarThemeDark,' 'backgroundColor: Color(0xFF18191E),' \
|
|
flutter/lib/common.dart
|
|
}
|
|
|
|
is_unpatched_state() {
|
|
has_exact_count "$THEME_MATCHES" 'dialogTheme: DialogTheme(' flutter/lib/common.dart &&
|
|
has_exact_count "$THEME_MATCHES" 'tabBarTheme: const TabBarTheme(' flutter/lib/common.dart &&
|
|
has_exact_count "$SINGLE_MATCH" 'extended_text: 14.0.0' flutter/pubspec.yaml &&
|
|
has_exact_count "$SINGLE_MATCH" 'google_fonts: ^6.2.1' flutter/pubspec.yaml &&
|
|
has_exact_count "$NO_MATCHES" 'dialogTheme: DialogThemeData(' flutter/lib/common.dart &&
|
|
has_exact_count "$NO_MATCHES" 'tabBarTheme: const TabBarThemeData(' flutter/lib/common.dart &&
|
|
has_exact_count "$NO_MATCHES" 'backgroundColor: Colors.white,' flutter/lib/common.dart &&
|
|
has_exact_count "$NO_MATCHES" 'backgroundColor: Color(0xFF18191E),' flutter/lib/common.dart &&
|
|
has_exact_count "$NO_MATCHES" 'extended_text: 15.0.2' flutter/pubspec.yaml &&
|
|
has_exact_count "$NO_MATCHES" 'google_fonts: ^8.1.0' flutter/pubspec.yaml
|
|
}
|
|
|
|
if ! validate_patch_inputs; then
|
|
exit 1
|
|
fi
|
|
|
|
if is_complete_patch_state; then
|
|
echo "Flutter 3.44 source patches already applied."
|
|
git --no-pager diff -- flutter/lib/common.dart flutter/pubspec.yaml
|
|
exit 0
|
|
fi
|
|
|
|
if ! is_unpatched_state; then
|
|
echo "Flutter 3.44 source patches are partially applied or their anchors have drifted." >&2
|
|
exit 1
|
|
fi
|
|
|
|
# ThemeData API renames (Flutter 3.27+):
|
|
sed -i 's/dialogTheme: DialogTheme(/dialogTheme: DialogThemeData(/g' flutter/lib/common.dart
|
|
sed -i 's/tabBarTheme: const TabBarTheme(/tabBarTheme: const TabBarThemeData(/g' flutter/lib/common.dart
|
|
sed -i '/static ThemeData lightTheme = ThemeData(/,/static ThemeData darkTheme = ThemeData(/s/dialogTheme: DialogThemeData(/dialogTheme: DialogThemeData(\
|
|
backgroundColor: Colors.white,/' flutter/lib/common.dart
|
|
sed -i '/static ThemeData darkTheme = ThemeData(/,/scrollbarTheme: scrollbarThemeDark,/s/dialogTheme: DialogThemeData(/dialogTheme: DialogThemeData(\
|
|
backgroundColor: Color(0xFF18191E),/' flutter/lib/common.dart
|
|
# Dependency bumps required by the newer Dart/Flutter:
|
|
sed -i 's/extended_text: 14.0.0/extended_text: 15.0.2/' flutter/pubspec.yaml
|
|
sed -i 's/google_fonts: \^6.2.1/google_fonts: ^8.1.0/' flutter/pubspec.yaml
|
|
|
|
# Fail loudly if any expected substitution did not produce the complete state.
|
|
if ! is_complete_patch_state; then
|
|
echo "Flutter 3.44 source patches did not produce the expected state." >&2
|
|
exit 1
|
|
fi
|
|
|
|
git --no-pager diff -- flutter/lib/common.dart flutter/pubspec.yaml
|