From 854505dfcb9525994ba90c239c67ee2b969dda42 Mon Sep 17 00:00:00 2001 From: niuhuan Date: Fri, 3 Feb 2023 11:20:24 +0800 Subject: [PATCH] :rocket: Modify asset names --- ci/cmd/check_asset/main.go | 18 +++++++++++------- ci/cmd/upload_asset/main.go | 30 ++++++++++++++++++++++-------- ci/version.code.txt | 2 +- ci/version.info.txt | 6 ++++++ 4 files changed, 40 insertions(+), 16 deletions(-) diff --git a/ci/cmd/check_asset/main.go b/ci/cmd/check_asset/main.go index 7e5fc28..9996e0b 100644 --- a/ci/cmd/check_asset/main.go +++ b/ci/cmd/check_asset/main.go @@ -7,6 +7,7 @@ import ( "io/ioutil" "net/http" "os" + "strings" ) func main() { @@ -34,19 +35,22 @@ func main() { var releaseFileName string switch target { case "macos": - releaseFileName = fmt.Sprintf("pikapika-%v-flutter_%v-macos-intel.dmg", version.Code, flutterVersion) + releaseFileName = fmt.Sprintf("pikapika-%v-macos-intel.dmg", version.Code) case "ios": - releaseFileName = fmt.Sprintf("pikapika-%v-flutter_%v-ios-nosign.ipa", version.Code, flutterVersion) + releaseFileName = fmt.Sprintf("pikapika-%v-ios-nosign.ipa", version.Code) case "windows": - releaseFileName = fmt.Sprintf("pikapika-%v-flutter_%v-windows-x86_64.zip", version.Code, flutterVersion) + releaseFileName = fmt.Sprintf("pikapika-%v-windows-x86_64.zip", version.Code) case "linux": - releaseFileName = fmt.Sprintf("pikapika-%v-flutter_%v-linux-x86_64.AppImage", version.Code, flutterVersion) + releaseFileName = fmt.Sprintf("pikapika-%v-linux-x86_64.AppImage", version.Code) case "android-arm32": - releaseFileName = fmt.Sprintf("pikapika-%v-flutter_%v-android-arm32.apk", version.Code, flutterVersion) + releaseFileName = fmt.Sprintf("pikapika-%v-android-arm32.apk", version.Code) case "android-arm64": - releaseFileName = fmt.Sprintf("pikapika-%v-flutter_%v-android-arm64.apk", version.Code, flutterVersion) + releaseFileName = fmt.Sprintf("pikapika-%v-android-arm64.apk", version.Code) case "android-x86_64": - releaseFileName = fmt.Sprintf("pikapika-%v-flutter_%v-android-x86_64.apk", version.Code, flutterVersion) + releaseFileName = fmt.Sprintf("pikapika-%v-android-x86_64.apk", version.Code) + } + if strings.HasPrefix(flutterVersion, "2.") { + releaseFileName = "z-of-" + releaseFileName } // get version getReleaseRequest, err := http.NewRequest( diff --git a/ci/cmd/upload_asset/main.go b/ci/cmd/upload_asset/main.go index 48522d8..d497cbe 100644 --- a/ci/cmd/upload_asset/main.go +++ b/ci/cmd/upload_asset/main.go @@ -8,6 +8,7 @@ import ( "net/http" "os" "path" + "strings" ) func main() { @@ -32,38 +33,51 @@ func main() { os.Exit(1) } // - var releaseFilePath string var releaseFileName string + switch target { + case "macos": + releaseFileName = fmt.Sprintf("pikapika-%v-macos-intel.dmg", version.Code) + case "ios": + releaseFileName = fmt.Sprintf("pikapika-%v-ios-nosign.ipa", version.Code) + case "windows": + releaseFileName = fmt.Sprintf("pikapika-%v-windows-x86_64.zip", version.Code) + case "linux": + releaseFileName = fmt.Sprintf("pikapika-%v-linux-x86_64.AppImage", version.Code) + case "android-arm32": + releaseFileName = fmt.Sprintf("pikapika-%v-android-arm32.apk", version.Code) + case "android-arm64": + releaseFileName = fmt.Sprintf("pikapika-%v-android-arm64.apk", version.Code) + case "android-x86_64": + releaseFileName = fmt.Sprintf("pikapika-%v-android-x86_64.apk", version.Code) + } + if strings.HasPrefix(flutterVersion, "2.") { + releaseFileName = "z-of-" + releaseFileName + } + // + var releaseFilePath string var contentType string var contentLength int64 switch target { case "macos": releaseFilePath = "build/build.dmg" - releaseFileName = fmt.Sprintf("pikapika-%v-flutter_%v-macos-intel.dmg", version.Code, flutterVersion) contentType = "application/octet-stream" case "ios": releaseFilePath = "build/nosign.ipa" - releaseFileName = fmt.Sprintf("pikapika-%v-flutter_%v-ios-nosign.ipa", version.Code, flutterVersion) contentType = "application/octet-stream" case "windows": releaseFilePath = "build/build.zip" - releaseFileName = fmt.Sprintf("pikapika-%v-flutter_%v-windows-x86_64.zip", version.Code, flutterVersion) contentType = "application/octet-stream" case "linux": releaseFilePath = "build/build.AppImage" - releaseFileName = fmt.Sprintf("pikapika-%v-flutter_%v-linux-x86_64.AppImage", version.Code, flutterVersion) contentType = "application/octet-stream" case "android-arm32": releaseFilePath = "build/app/outputs/flutter-apk/app-release.apk" - releaseFileName = fmt.Sprintf("pikapika-%v-flutter_%v-android-arm32.apk", version.Code, flutterVersion) contentType = "application/octet-stream" case "android-arm64": releaseFilePath = "build/app/outputs/flutter-apk/app-release.apk" - releaseFileName = fmt.Sprintf("pikapika-%v-flutter_%v-android-arm64.apk", version.Code, flutterVersion) contentType = "application/octet-stream" case "android-x86_64": releaseFilePath = "build/app/outputs/flutter-apk/app-release.apk" - releaseFileName = fmt.Sprintf("pikapika-%v-flutter_%v-android-x86_64.apk", version.Code, flutterVersion) contentType = "application/octet-stream" } releaseFilePath = path.Join("..", releaseFilePath) diff --git a/ci/version.code.txt b/ci/version.code.txt index 4f1826f..bf991af 100644 --- a/ci/version.code.txt +++ b/ci/version.code.txt @@ -1 +1 @@ -v1.6.4 \ No newline at end of file +v1.6.5 \ No newline at end of file diff --git a/ci/version.info.txt b/ci/version.info.txt index 617cbda..42a41f3 100644 --- a/ci/version.info.txt +++ b/ci/version.info.txt @@ -1,3 +1,9 @@ + +v1.6.5 + +- [x] ✨️导出未下载完或下载错误的漫画 +- [x] ♻️优化安卓DeepLinks + v1.6.4 - [x] ✨️去掉UI动画的选项 (对阅读器友好)