mirror of
https://github.com/rustdesk/rustdesk.git
synced 2026-11-04 16:35:19 +00: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>
117 lines
4.2 KiB
YAML
117 lines
4.2 KiB
YAML
# This yaml shares the build bridge steps with ci and nightly.
|
|
name: Build flutter-rust-bridge
|
|
# 2023-11-23 18:00:00+00:00
|
|
|
|
on:
|
|
workflow_call:
|
|
|
|
env:
|
|
CARGO_EXPAND_VERSION: "1.0.95"
|
|
FLUTTER_RUST_BRIDGE_VERSION: "1.80.1"
|
|
RUST_VERSION: "1.75" # https://github.com/rustdesk/rustdesk/discussions/7503
|
|
|
|
jobs:
|
|
generate_bridge:
|
|
runs-on: ${{ matrix.job.os }}
|
|
strategy:
|
|
fail-fast: false
|
|
matrix:
|
|
job:
|
|
# Default bridge for every platform still on Flutter 3.24.5 (generated with 3.22.3).
|
|
- {
|
|
target: x86_64-unknown-linux-gnu,
|
|
os: ubuntu-22.04,
|
|
extra-build-args: "",
|
|
flutter-version: "3.22.3",
|
|
artifact-name: "bridge-artifact",
|
|
}
|
|
# Dedicated bridge for the Windows and macOS arm64 builds (Flutter 3.44); runs in parallel.
|
|
- {
|
|
target: x86_64-unknown-linux-gnu,
|
|
os: ubuntu-22.04,
|
|
extra-build-args: "",
|
|
flutter-version: "3.44.8",
|
|
artifact-name: "bridge-artifact-flutter-3.44",
|
|
}
|
|
steps:
|
|
- name: Checkout source code
|
|
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
|
|
with:
|
|
submodules: recursive
|
|
|
|
- name: Install prerequisites
|
|
run: |
|
|
sudo apt-get install ca-certificates -y
|
|
sudo apt-get update -y
|
|
sudo apt-get install -y \
|
|
clang \
|
|
cmake \
|
|
curl \
|
|
gcc \
|
|
git \
|
|
g++ \
|
|
libclang-dev \
|
|
libgtk-3-dev \
|
|
llvm-dev \
|
|
nasm \
|
|
ninja-build \
|
|
pkg-config \
|
|
wget
|
|
|
|
- name: Install Rust toolchain
|
|
uses: dtolnay/rust-toolchain@e97e2d8cc328f1b50210efc529dca0028893a2d9 # v1
|
|
with:
|
|
toolchain: ${{ env.RUST_VERSION }}
|
|
targets: ${{ matrix.job.target }}
|
|
components: "rustfmt"
|
|
|
|
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
|
|
with:
|
|
prefix-key: bridge-${{ matrix.job.os }}
|
|
|
|
- name: Cache Bridge
|
|
id: cache-bridge
|
|
uses: actions/cache@6f8efc29b200d32929f49075959781ed54ec270c # v3
|
|
with:
|
|
path: /tmp/flutter_rust_bridge
|
|
key: bridge-${{ matrix.job.flutter-version }}
|
|
|
|
- name: Install flutter
|
|
uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # v2
|
|
with:
|
|
channel: "stable"
|
|
flutter-version: ${{ matrix.job.flutter-version }}
|
|
cache: true
|
|
|
|
- name: Install flutter rust bridge deps
|
|
shell: bash
|
|
run: |
|
|
cargo install cargo-expand --version ${{ env.CARGO_EXPAND_VERSION }} --locked
|
|
cargo install flutter_rust_bridge_codegen --version ${{ env.FLUTTER_RUST_BRIDGE_VERSION }} --features "uuid" --locked
|
|
if [[ "${{ matrix.job.flutter-version }}" == "3.22.3" ]]; then
|
|
# Default Flutter 3.22.3: extended_text 14 needs a newer Dart, so downgrade for resolution.
|
|
sed -i -e 's/extended_text: 14.0.0/extended_text: 13.0.0/g' flutter/pubspec.yaml
|
|
else
|
|
# Flutter 3.44 bridge for Windows/macOS arm64: match those builds' source/pubspec state so
|
|
# the generated *.freezed.dart compiles against the same Flutter/freezed they resolve.
|
|
bash .github/patches/apply_flutter_3.44_source_patches.sh
|
|
fi
|
|
pushd flutter && flutter pub get && popd
|
|
|
|
- name: Run flutter rust bridge
|
|
run: |
|
|
~/.cargo/bin/flutter_rust_bridge_codegen --rust-input ./src/flutter_ffi.rs --dart-output ./flutter/lib/generated_bridge.dart --c-output ./flutter/macos/Runner/bridge_generated.h
|
|
cp ./flutter/macos/Runner/bridge_generated.h ./flutter/ios/Runner/bridge_generated.h
|
|
|
|
- name: Upload Artifact
|
|
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
|
|
with:
|
|
name: ${{ matrix.job.artifact-name }}
|
|
path: |
|
|
./src/bridge_generated.rs
|
|
./src/bridge_generated.io.rs
|
|
./flutter/lib/generated_bridge.dart
|
|
./flutter/lib/generated_bridge.freezed.dart
|
|
./flutter/macos/Runner/bridge_generated.h
|
|
./flutter/ios/Runner/bridge_generated.h
|