From 15d5b15156b5ab0fac74a292e0f5facf3867cfbb Mon Sep 17 00:00:00 2001 From: niuhuan Date: Tue, 25 Oct 2022 13:47:18 +0800 Subject: [PATCH] fix categories --- .github/workflows/Release.yml | 19 +++++++++++-------- ci/src/check_asset/main.rs | 35 +++++++++++++---------------------- ci/src/upload_asset/main.rs | 35 +++++++++++++---------------------- ci/version.code.txt | 2 +- ci/version.info.txt | 8 +++++++- 5 files changed, 45 insertions(+), 54 deletions(-) diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml index 9d54d2f..411a1ad 100644 --- a/.github/workflows/Release.yml +++ b/.github/workflows/Release.yml @@ -66,16 +66,16 @@ jobs: config: - target: linux host: ubuntu-latest - flutter_version: '3.3.4' + flutter_version: '3.3.5' - target: windows host: windows-latest - flutter_version: '3.3.4' + flutter_version: '3.3.5' - target: macos host: macos-11 - flutter_version: '3.3.4' + flutter_version: '3.3.5' - target: ios host: macos-11 - flutter_version: '3.3.4' + flutter_version: '3.3.5' - target: android-arm32 host: ubuntu-latest flutter_version: '2.10.5' @@ -87,13 +87,13 @@ jobs: flutter_version: '2.10.5' - target: android-arm32 host: ubuntu-latest - flutter_version: '3.3.4' + flutter_version: '3.3.5' - target: android-arm64 host: ubuntu-latest - flutter_version: '3.3.4' + flutter_version: '3.3.5' - target: android-x86_64 host: ubuntu-latest - flutter_version: '3.3.4' + flutter_version: '3.3.5' runs-on: ${{ matrix.config.host }} @@ -369,13 +369,16 @@ jobs: --c-output macos/Runner/bridge_generated.h \ --rust-crate-dir native \ --class-name Native + rustup target install x86_64-apple-darwin + rustup target install aarch64-apple-darwin cargo build --manifest-path native/Cargo.toml --release --target x86_64-apple-darwin + cargo build --manifest-path native/Cargo.toml --release --target aarch64-apple-darwin flutter config --enable-macos-desktop flutter build macos cd build mkdir appimage mv macos/Build/Products/Release/daisy.app appimage/ - mv ../native/target/x86_64-apple-darwin/release/libnative.dylib appimage/daisy.app/Contents/Frameworks/ + lipo -create -output appimage/daisy.app/Contents/Frameworks/ ../native/target/x86_64-apple-darwin/release/libnative.dylib ../native/target/aarch64-apple-darwin/release/libnative.dylib ln -sf /Applications appimage/ hdiutil create -volname daisy -srcfolder appimage -ov -format UDBZ macos.dmg cd .. diff --git a/ci/src/check_asset/main.rs b/ci/src/check_asset/main.rs index e814ae2..ad802a8 100644 --- a/ci/src/check_asset/main.rs +++ b/ci/src/check_asset/main.rs @@ -22,31 +22,22 @@ async fn main() -> Result<()> { let code = vs_code_txt.trim(); let release_file_name = match target.as_str() { - "macos" => format!("daisy-{}-flutter_{}-macos-intel.dmg", code, flutter_version), - "ios" => format!("daisy-{}-flutter_{}-ios-nosign.ipa", code, flutter_version), - "windows" => format!( - "daisy-{}-flutter_{}-windows-x86_64.zip", - code, flutter_version - ), - "linux" => format!( - "daisy-{}-flutter_{}-linux-x86_64.AppImage", - code, flutter_version - ), - "android-arm32" => format!( - "daisy-{}-flutter_{}-android-arm32.apk", - code, flutter_version - ), - "android-arm64" => format!( - "daisy-{}-flutter_{}-android-arm64.apk", - code, flutter_version - ), - "android-x86_64" => format!( - "daisy-{}-flutter_{}-android-x86_64.apk", - code, flutter_version - ), + "macos" => format!("daisy-{}.dmg", code), + "ios" => format!("daisy-{}-nosign.ipa", code), + "windows" => format!("daisy-{}-windows-x86_64.zip", code), + "linux" => format!("daisy-{}-linux-x86_64.AppImage", code), + "android-arm32" => format!("daisy-{}-arm32.apk", code), + "android-arm64" => format!("daisy-{}-arm64.apk", code), + "android-x86_64" => format!("daisy-{}-x86_64.apk", code), un => panic!("unknown target : {}-flutter_{}", un, flutter_version), }; + let release_file_name = if flutter_version.starts_with("2.") { + format!("of-{}",let release_file_name) + } else { + release_file_name + }; + let client = reqwest::ClientBuilder::new().user_agent(UA).build()?; let check_response = client diff --git a/ci/src/upload_asset/main.rs b/ci/src/upload_asset/main.rs index 95fcc17..ee94619 100644 --- a/ci/src/upload_asset/main.rs +++ b/ci/src/upload_asset/main.rs @@ -19,31 +19,22 @@ async fn main() -> Result<()> { let code = vs_code_txt.trim(); let release_file_name = match target.as_str() { - "macos" => format!("daisy-{}-flutter_{}-macos-intel.dmg", code, flutter_version), - "ios" => format!("daisy-{}-flutter_{}-ios-nosign.ipa", code, flutter_version), - "windows" => format!( - "daisy-{}-flutter_{}-windows-x86_64.zip", - code, flutter_version - ), - "linux" => format!( - "daisy-{}-flutter_{}-linux-x86_64.AppImage", - code, flutter_version - ), - "android-arm32" => format!( - "daisy-{}-flutter_{}-android-arm32.apk", - code, flutter_version - ), - "android-arm64" => format!( - "daisy-{}-flutter_{}-android-arm64.apk", - code, flutter_version - ), - "android-x86_64" => format!( - "daisy-{}-flutter_{}-android-x86_64.apk", - code, flutter_version - ), + "macos" => format!("daisy-{}.dmg", code), + "ios" => format!("daisy-{}-nosign.ipa", code), + "windows" => format!("daisy-{}-windows-x86_64.zip", code), + "linux" => format!("daisy-{}-linux-x86_64.AppImage", code), + "android-arm32" => format!("daisy-{}-arm32.apk", code), + "android-arm64" => format!("daisy-{}-arm64.apk", code), + "android-x86_64" => format!("daisy-{}-x86_64.apk", code), un => panic!("unknown target : {}-flutter_{}", un, flutter_version), }; + let release_file_name = if flutter_version.starts_with("2.") { + format!("of-{}",let release_file_name) + } else { + release_file_name + }; + let local_path = match target.as_str() { "macos" => "../build/macos.dmg", "ios" => "../build/nosign.ipa", diff --git a/ci/version.code.txt b/ci/version.code.txt index ddd9164..f68b119 100644 --- a/ci/version.code.txt +++ b/ci/version.code.txt @@ -1 +1 @@ -v0.1.9 \ No newline at end of file +v0.1.10 \ No newline at end of file diff --git a/ci/version.info.txt b/ci/version.info.txt index 8a5a76d..32e9c11 100644 --- a/ci/version.info.txt +++ b/ci/version.info.txt @@ -1,5 +1,11 @@ 计划 - - [x] 下载? / 小说翻页? + - [x] 下载? / 小说翻页? / 高清画质? + +v0.1.10 + - [x] 修复分类不显示漫画的问题 + - [x] 升级flutter引擎 + - [x] macos 同时支持 m1 + intel 支持 + - [x] 安卓圆形图标自适应 v0.1.9 - [x] 布局小改动