hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

opt: upgrade flutter ci/nightly to 3.7.0 stable

Browse Source 
This reverts commit 6f9b3ae466dbb77dfcc140b7313336118f84d53e.
This commit is contained in:
Kingtous 2023-01-28 09:41:05 +08:00
parent a529b14f2d
commit a17f14b92a
5 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
.github/workflows/flutter-ci.yml vendored
View File

@ -13,8 +13,7 @@ on:
env: env:
LLVM_VERSION: "10.0" LLVM_VERSION: "10.0"
# Note: currently 3.0.5 does not support arm64 officially, we use latest stable version first. FLUTTER_VERSION: "3.7.0"
FLUTTER_VERSION: "3.0.5"
# vcpkg version: 2022.05.10 # vcpkg version: 2022.05.10
# for multiarch gcc compatibility # for multiarch gcc compatibility
VCPKG_COMMIT_ID: "14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44" VCPKG_COMMIT_ID: "14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44"
@ -51,9 +50,9 @@ jobs:
run: | run: |
flutter doctor -v flutter doctor -v
flutter precache --windows flutter precache --windows
Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.0.5-rustdesk.2/windows-x64-flutter-release.zip -OutFile windows-x64-flutter-release.zip Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.7.0-rustdesk/windows-x64-release-flutter.zip -OutFile windows-x64-flutter-release.zip
Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine
mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-3.0.5-x64/bin/cache/artifacts/engine/windows-x64-release/ mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-${{ env.FLUTTER_VERSION }}-x64/bin/cache/artifacts/engine/windows-x64-release/
- name: Install Rust toolchain - name: Install Rust toolchain
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
@ -853,12 +852,12 @@ jobs:
# disable git safe.directory # disable git safe.directory
git config --global --add safe.directory "*" git config --global --add safe.directory "*"
pushd /opt pushd /opt
# clone repo and reset to flutter 3.0.5 # clone repo and reset to flutter 3.7.0
git clone https://github.com/sony/flutter-elinux.git || true git clone https://github.com/sony/flutter-elinux.git || true
pushd flutter-elinux pushd flutter-elinux
# reset to flutter 3.0.5 # reset to flutter 3.7.0
git fetch git fetch
git reset --hard b09a90eee643859ce4e676839227edd9fd3feba8 git reset --hard 51a1d685901f79fbac51665a967c3a1a789ecee5
popd popd
- uses: Kingtous/run-on-arch-action@amd64-support - uses: Kingtous/run-on-arch-action@amd64-support
@ -883,11 +882,17 @@ jobs:
git config --global --add safe.directory "*" git config --global --add safe.directory "*"
pushd /workspace pushd /workspace
# we use flutter-elinux to build our rustdesk # we use flutter-elinux to build our rustdesk
sed -i "s/flutter build linux --release/flutter-elinux build linux/g" ./build.py
# Setup flutter-elinux
export PATH=/opt/flutter-elinux/bin:$PATH export PATH=/opt/flutter-elinux/bin:$PATH
sed -i "s/flutter build linux --release/flutter-elinux build linux/g" ./build.py
# Setup flutter-elinux. Run doctor to check if issues here.
flutter-elinux doctor -v flutter-elinux doctor -v
# edit to corresponding arch # Patch arm64 engine for flutter 3.6.0+
flutter-elinux precache --linux
pushd /tmp
curl -O https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.7.0-stable.tar.xz
tar -xvf flutter_linux_3.7.0-stable.tar.xz flutter/bin/cache/artifacts/engine/linux-x64/shader_lib
cp -R flutter/bin/cache/artifacts/engine/linux-x64/shader_lib /opt/flutter-elinux/flutter/bin/cache/artifacts/engine/linux-arm64
popd
case ${{ matrix.job.arch }} in case ${{ matrix.job.arch }} in
aarch64) aarch64)
sed -i "s/Architecture: amd64/Architecture: arm64/g" ./build.py sed -i "s/Architecture: amd64/Architecture: arm64/g" ./build.py

24
.github/workflows/flutter-nightly.yml vendored
View File

@ -8,8 +8,7 @@ on:
env: env:
LLVM_VERSION: "10.0" LLVM_VERSION: "10.0"
# Note: currently 3.0.5 does not support arm64 officially, we use latest stable version first. FLUTTER_VERSION: "3.7.0"
FLUTTER_VERSION: "3.0.5"
TAG_NAME: "nightly" TAG_NAME: "nightly"
# vcpkg version: 2022.05.10 # vcpkg version: 2022.05.10
# for multiarch gcc compatibility # for multiarch gcc compatibility
@ -53,9 +52,9 @@ jobs:
run: | run: |
flutter doctor -v flutter doctor -v
flutter precache --windows flutter precache --windows
Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.0.5-rustdesk.2/windows-x64-flutter-release.zip -OutFile windows-x64-flutter-release.zip Invoke-WebRequest -Uri https://github.com/Kingtous/engine/releases/download/v3.7.0-rustdesk/windows-x64-release-flutter.zip -OutFile windows-x64-flutter-release.zip
Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine Expand-Archive windows-x64-flutter-release.zip -DestinationPath engine
mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-3.0.5-x64/bin/cache/artifacts/engine/windows-x64-release/ mv -Force engine/* C:/hostedtoolcache/windows/flutter/stable-${{ env.FLUTTER_VERSION }}-x64/bin/cache/artifacts/engine/windows-x64-release/
- name: Install Rust toolchain - name: Install Rust toolchain
uses: actions-rs/toolchain@v1 uses: actions-rs/toolchain@v1
@ -999,12 +998,12 @@ jobs:
# disable git safe.directory # disable git safe.directory
git config --global --add safe.directory "*" git config --global --add safe.directory "*"
pushd /opt pushd /opt
# clone repo and reset to flutter 3.0.5 # clone repo and reset to flutter 3.7.0
git clone https://github.com/sony/flutter-elinux.git || true git clone https://github.com/sony/flutter-elinux.git || true
pushd flutter-elinux pushd flutter-elinux
# reset to flutter 3.0.5 # reset to flutter 3.7.0
git fetch git fetch
git reset --hard b09a90eee643859ce4e676839227edd9fd3feba8 git reset --hard 51a1d685901f79fbac51665a967c3a1a789ecee5
popd popd
- uses: Kingtous/run-on-arch-action@amd64-support - uses: Kingtous/run-on-arch-action@amd64-support
@ -1029,10 +1028,17 @@ jobs:
git config --global --add safe.directory "*" git config --global --add safe.directory "*"
pushd /workspace pushd /workspace
# we use flutter-elinux to build our rustdesk # we use flutter-elinux to build our rustdesk
sed -i "s/flutter build linux --release/flutter-elinux build linux/g" ./build.py
# Setup flutter-elinux
export PATH=/opt/flutter-elinux/bin:$PATH export PATH=/opt/flutter-elinux/bin:$PATH
sed -i "s/flutter build linux --release/flutter-elinux build linux/g" ./build.py
# Setup flutter-elinux. Run doctor to check if issues here.
flutter-elinux doctor -v flutter-elinux doctor -v
# Patch arm64 engine for flutter 3.6.0+
flutter-elinux precache --linux
pushd /tmp
curl -O https://storage.googleapis.com/flutter_infra_release/releases/stable/linux/flutter_linux_3.7.0-stable.tar.xz
tar -xvf flutter_linux_3.7.0-stable.tar.xz flutter/bin/cache/artifacts/engine/linux-x64/shader_lib
cp -R flutter/bin/cache/artifacts/engine/linux-x64/shader_lib /opt/flutter-elinux/flutter/bin/cache/artifacts/engine/linux-arm64
popd
# edit to corresponding arch # edit to corresponding arch
case ${{ matrix.job.arch }} in case ${{ matrix.job.arch }} in
aarch64) aarch64)

11
flutter/lib/utils/multi_window_manager.dart
View File

@ -63,8 +63,7 @@ class RustDeskMultiWindowManager {
..setFrame(const Offset(0, 0) & const Size(1280, 720)) ..setFrame(const Offset(0, 0) & const Size(1280, 720))
..center() ..center()
..setTitle(getWindowNameWithId(remoteId, ..setTitle(getWindowNameWithId(remoteId,
overrideType: WindowType.RemoteDesktop)) overrideType: WindowType.RemoteDesktop));
..show();
registerActiveWindow(remoteDesktopController.windowId); registerActiveWindow(remoteDesktopController.windowId);
_remoteDesktopWindowId = remoteDesktopController.windowId; _remoteDesktopWindowId = remoteDesktopController.windowId;
} else { } else {
@ -90,8 +89,7 @@ class RustDeskMultiWindowManager {
..setFrame(const Offset(0, 0) & const Size(1280, 720)) ..setFrame(const Offset(0, 0) & const Size(1280, 720))
..center() ..center()
..setTitle(getWindowNameWithId(remoteId, ..setTitle(getWindowNameWithId(remoteId,
overrideType: WindowType.FileTransfer)) overrideType: WindowType.FileTransfer));
..show();
registerActiveWindow(fileTransferController.windowId); registerActiveWindow(fileTransferController.windowId);
_fileTransferWindowId = fileTransferController.windowId; _fileTransferWindowId = fileTransferController.windowId;
} else { } else {
@ -116,9 +114,8 @@ class RustDeskMultiWindowManager {
portForwardController portForwardController
..setFrame(const Offset(0, 0) & const Size(1280, 720)) ..setFrame(const Offset(0, 0) & const Size(1280, 720))
..center() ..center()
..setTitle( ..setTitle(getWindowNameWithId(remoteId,
getWindowNameWithId(remoteId, overrideType: WindowType.PortForward)) overrideType: WindowType.PortForward));
..show();
registerActiveWindow(portForwardController.windowId); registerActiveWindow(portForwardController.windowId);
_portForwardWindowId = portForwardController.windowId; _portForwardWindowId = portForwardController.windowId;
} else { } else {

2
flutter/macos/Runner/MainFlutterWindow.swift
View File

@ -7,7 +7,7 @@ import desktop_drop
import device_info_plus_macos import device_info_plus_macos
import flutter_custom_cursor import flutter_custom_cursor
import package_info_plus_macos import package_info_plus_macos
import path_provider_macos import path_provider_foundation
import screen_retriever import screen_retriever
import sqflite import sqflite
// import tray_manager // import tray_manager

10
flutter/pubspec.yaml
View File

@ -31,7 +31,7 @@ dependencies:
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.3 cupertino_icons: ^1.0.3
ffi: ^2.0.1 ffi: ^2.0.1
path_provider: ^2.0.2 path_provider: ^2.0.12
external_path: ^1.0.1 external_path: ^1.0.1
provider: ^6.0.3 provider: ^6.0.3
tuple: ^2.0.0 tuple: ^2.0.0
@ -75,14 +75,14 @@ dependencies:
debounce_throttle: ^2.0.0 debounce_throttle: ^2.0.0
file_picker: ^5.1.0 file_picker: ^5.1.0
flutter_svg: ^1.1.5 flutter_svg: ^1.1.5
flutter_improved_scrolling: ^0.0.3 flutter_improved_scrolling:
# currently, we use flutter 3.0.5 for windows build, latest for other builds. # currently, we use flutter 3.0.5 for windows build, latest for other builds.
# #
# for flutter 3.0.5, please use official version(just comment code below). # for flutter 3.0.5, please use official version(just comment code below).
# if build rustdesk by flutter >=3.3, please use our custom pub below (uncomment code below). # if build rustdesk by flutter >=3.3, please use our custom pub below (uncomment code below).
# git: git:
# url: https://github.com/Kingtous/flutter_improved_scrolling url: https://github.com/Kingtous/flutter_improved_scrolling
# ref: 62f09545149f320616467c306c8c5f71714a18e6 ref: 62f09545149f320616467c306c8c5f71714a18e6
uni_links: ^0.5.1 uni_links: ^0.5.1
uni_links_desktop: ^0.1.4 uni_links_desktop: ^0.1.4
path: ^1.8.1 path: ^1.8.1