fix Generate Flutter Rust bridge
This commit is contained in:
1 file changed
+47
@@ -331,10 +331,23 @@ jobs:
|
|||||||
|
|
||||||
cd rustdesk
|
cd rustdesk
|
||||||
|
|
||||||
|
# -------------------------------------------------------------------
|
||||||
|
# Flutter 3.22.3 cannot resolve extended_text 14.0.0.
|
||||||
|
#
|
||||||
|
# Upstream RustDesk downgrades it to 13.0.0 ONLY while generating
|
||||||
|
# flutter-rust-bridge files.
|
||||||
|
#
|
||||||
|
# Android itself is built with Flutter 3.24.5 and MUST use
|
||||||
|
# extended_text 14.0.0.
|
||||||
|
# -------------------------------------------------------------------
|
||||||
|
|
||||||
sed -i \
|
sed -i \
|
||||||
's/extended_text: 14.0.0/extended_text: 13.0.0/g' \
|
's/extended_text: 14.0.0/extended_text: 13.0.0/g' \
|
||||||
flutter/pubspec.yaml
|
flutter/pubspec.yaml
|
||||||
|
|
||||||
|
echo "Bridge dependency:"
|
||||||
|
grep -n "extended_text:" flutter/pubspec.yaml
|
||||||
|
|
||||||
pushd flutter
|
pushd flutter
|
||||||
|
|
||||||
flutter pub get
|
flutter pub get
|
||||||
@@ -357,7 +370,33 @@ jobs:
|
|||||||
test -f flutter/macos/Runner/bridge_generated.h
|
test -f flutter/macos/Runner/bridge_generated.h
|
||||||
test -f flutter/ios/Runner/bridge_generated.h
|
test -f flutter/ios/Runner/bridge_generated.h
|
||||||
|
|
||||||
|
# -------------------------------------------------------------------
|
||||||
|
# IMPORTANT:
|
||||||
|
# Restore original RustDesk Flutter dependencies after bridge
|
||||||
|
# generation.
|
||||||
|
#
|
||||||
|
# This reproduces upstream RustDesk CI behaviour where bridge and
|
||||||
|
# Android builds run in separate jobs/checkouts.
|
||||||
|
# -------------------------------------------------------------------
|
||||||
|
|
||||||
|
git checkout -- \
|
||||||
|
flutter/pubspec.yaml \
|
||||||
|
flutter/pubspec.lock
|
||||||
|
|
||||||
|
rm -rf flutter/.dart_tool
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "Android dependency restored:"
|
||||||
|
grep -n "extended_text:" flutter/pubspec.yaml
|
||||||
|
|
||||||
|
if ! grep -q 'extended_text: 14.0.0' flutter/pubspec.yaml; then
|
||||||
|
echo "ERROR: extended_text 14.0.0 was not restored"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo
|
||||||
echo "Flutter Rust bridge generated successfully"
|
echo "Flutter Rust bridge generated successfully"
|
||||||
|
echo "extended_text restored to 14.0.0 for Android build"
|
||||||
|
|
||||||
# -----------------------------------------------------------------------
|
# -----------------------------------------------------------------------
|
||||||
# Flutter 3.24.5 for Android build
|
# Flutter 3.24.5 for Android build
|
||||||
@@ -627,6 +666,14 @@ jobs:
|
|||||||
|
|
||||||
pushd flutter
|
pushd flutter
|
||||||
|
|
||||||
|
echo "Checking Android Flutter dependencies..."
|
||||||
|
|
||||||
|
if ! grep -q 'extended_text: 14.0.0' pubspec.yaml; then
|
||||||
|
echo "ERROR: Wrong extended_text version for Android build"
|
||||||
|
grep -n "extended_text:" pubspec.yaml || true
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
flutter clean
|
flutter clean
|
||||||
|
|
||||||
flutter pub get
|
flutter pub get
|
||||||
|
|||||||
Reference in new issue
Block a user