From c353fc7c7caf074fa1451232cef683256641a4eb Mon Sep 17 00:00:00 2001 From: MistEO Date: Sat, 15 Oct 2022 16:17:22 +0800 Subject: [PATCH] build: Modify CI product name and remove unneeded files from the product package --- .github/workflows/dev-build-mac.yml | 2 +- .../{dev-build.yml => dev-build-win.yml} | 2 +- .github/workflows/release-maa-mac.yml | 4 ++-- .../{release-maa.yml => release-maa-win.yml} | 0 README.md | 6 ------ README_en-US.md | 8 +------- README_ja-JP.md | 6 ------ README_zh-TW.md | 6 ------ package-definition.json | 19 +++++++++---------- src/MeoAsstGui/MeoAsstGui.csproj | 1 - tools/MaaBuilder/Build.cs | 2 +- 11 files changed, 15 insertions(+), 41 deletions(-) rename .github/workflows/{dev-build.yml => dev-build-win.yml} (98%) rename .github/workflows/{release-maa.yml => release-maa-win.yml} (100%) diff --git a/.github/workflows/dev-build-mac.yml b/.github/workflows/dev-build-mac.yml index ecf5f60030..77c37ac717 100644 --- a/.github/workflows/dev-build-mac.yml +++ b/.github/workflows/dev-build-mac.yml @@ -51,5 +51,5 @@ jobs: run: xcodebuild ARCHS="arm64 x86_64" CODE_SIGN_IDENTITY="-" DEVELOPMENT_TEAM="-" ONLY_ACTIVE_ARCH=NO -derivedDataPath DerivedData -project MeoAsstMac.xcodeproj -scheme MeoAsstMac - uses: actions/upload-artifact@v1 with: - name: MaaBundle-darwin + name: MAA-macOS path: src/MeoAsstMac/DerivedData/Build/Products/Debug diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build-win.yml similarity index 98% rename from .github/workflows/dev-build.yml rename to .github/workflows/dev-build-win.yml index 55ee73c18b..824f128247 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build-win.yml @@ -71,5 +71,5 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: actions/upload-artifact@v1 with: - name: artifacts + name: MAA-Win-x64 path: artifacts diff --git a/.github/workflows/release-maa-mac.yml b/.github/workflows/release-maa-mac.yml index 91e841b3fd..68d433b542 100644 --- a/.github/workflows/release-maa-mac.yml +++ b/.github/workflows/release-maa-mac.yml @@ -61,12 +61,12 @@ jobs: run: | GIT_TAG=${GITHUB_REF#refs/*/} echo "GIT_TAG=${GIT_TAG}" >> $GITHUB_ENV - echo "APP_DMG=MaaBundle-darwin-${GIT_TAG}.dmg" >> $GITHUB_ENV + echo "APP_DMG=MAA-macOS-${GIT_TAG}.dmg" >> $GITHUB_ENV echo "APP_SYM=MAA-DebugSymbol-macOS-${GIT_TAG}.zip" >> $GITHUB_ENV - name: Download artifacts uses: actions/download-artifact@v3 with: - name: MaaBundle-darwin + name: MAA-macOS - name: 'Verify image' run: | mv MeoAsstMac.dmg $APP_DMG diff --git a/.github/workflows/release-maa.yml b/.github/workflows/release-maa-win.yml similarity index 100% rename from .github/workflows/release-maa.yml rename to .github/workflows/release-maa-win.yml diff --git a/README.md b/README.md index c78918ded6..26139ce993 100644 --- a/README.md +++ b/README.md @@ -48,12 +48,6 @@ MAA 的意思是 MAA Assistant Arknights ## 下载地址 -***第一次使用请下载 `MaaBundle-vX.Y.Z.zip`*** - -***第一次使用请下载 `MaaBundle-vX.Y.Z.zip`*** - -***第一次使用请下载 `MaaBundle-vX.Y.Z.zip`*** - [稳定版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases/latest) [测试版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases) diff --git a/README_en-US.md b/README_en-US.md index fcbab96a5b..051498d5c3 100644 --- a/README_en-US.md +++ b/README_en-US.md @@ -48,12 +48,6 @@ Talk is cheap. Show me the pictures! ## Download -***Please download `MaaBundle-vX.Y.Z.zip` for first time use*** - -***Please download `MaaBundle-vX.Y.Z.zip` for first time use*** - -***Please download `MaaBundle-vX.Y.Z.zip` for first time use*** - [Stable](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases/latest) [Development](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases) @@ -150,7 +144,7 @@ Please refer to [Linux Tutorial](docs/en-us/2.1-LINUX_TUTORIAL.md) - [C interface](include/AsstCaller.h): [Integration Example](tools/TestCaller/main.cpp) - [Python interface](src/Python/asst.py): [Integration Example](src/Python/sample.py) -- [Golang interface](src/Golang/MaaAssistantArknights/): [Integration Example](src/Golang/MaaAssistantArknights/maa/maa.go) +- [Golang interface](src/Golang/MaaAssistantArknights/): [Integration Example](src/Golang/MaaAssistantArknights/maa/maa.go) - [Dart interface](src/dart/) - [Java interface](src/Java/Maaj): [Integration Example](src/Java/Maaj/src/main/java/com/iguigui/maaj/MaaJavaSample.java) - [Rust interface](src/Rust/src/maa_sys/): [HTTP api](src/Rust) diff --git a/README_ja-JP.md b/README_ja-JP.md index 17b62a8843..2447bba55a 100644 --- a/README_ja-JP.md +++ b/README_ja-JP.md @@ -48,12 +48,6 @@ UIを見れば使い方もすぐ分かる！ ## ダウンロードリンク -***初めて使用する場合 `MaaBundle-vX.Y.Z.zip` をダウンロードしてください*** - -***初めて使用する場合 `MaaBundle-vX.Y.Z.zip` をダウンロードしてください*** - -***初めて使用する場合 `MaaBundle-vX.Y.Z.zip` をダウンロードしてください*** - [安定版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases/latest) [ベータ版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases) diff --git a/README_zh-TW.md b/README_zh-TW.md index deb849d4a0..0e56433c28 100644 --- a/README_zh-TW.md +++ b/README_zh-TW.md @@ -48,12 +48,6 @@ MAA 的意思是 MAA Assistant Arknights ## 下載連結 -***第一次使用請下載 `MaaBundle-vX.Y.Z.zip`*** - -***第一次使用請下載 `MaaBundle-vX.Y.Z.zip`*** - -***第一次使用請下載 `MaaBundle-vX.Y.Z.zip`*** - [穩定版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases/latest) [測試版](https://github.com/MaaAssistantArknights/MaaAssistantArknights/releases) diff --git a/package-definition.json b/package-definition.json index 5d93599825..8b89518ad7 100644 --- a/package-definition.json +++ b/package-definition.json @@ -1,6 +1,6 @@ [ { - "name_template": "MaaBundle-{VERSION}", + "name_template": "MAA-Win-x64-{VERSION}", "type": "MaaBundle", "configuration": { "include": [ @@ -9,14 +9,13 @@ } }, { - "name_template": "MaaBundle-OTA-{VERSION}", + "name_template": "MAA-OTA-Win-x64-{VERSION}", "type": "MaaBundleOta", "configuration": { "include": [ "resource/**", "MeoAssistant.dll", - "MeoAsstGui.exe", - "作业制作器/**" + "MeoAsstGui.exe" ], "exclude": [ "**/PaddleOCR/**" @@ -24,7 +23,7 @@ } }, { - "name_template": "MaaCore-{VERSION}", + "name_template": "MAA-Core-Win-x64-{VERSION}", "type": "MaaCore", "configuration": { "include": [ @@ -33,7 +32,7 @@ } }, { - "name_template": "MaaDependency-{VERSION}", + "name_template": "MAA-Dependency-Win-x64-{VERSION}", "type": "MaaDependency", "configuration": { "include": [ @@ -48,7 +47,7 @@ } }, { - "name_template": "MaaDependencyNoAvx-{VERSION}", + "name_template": "MAA-DependencyNoAvx-Win-x64-{VERSION}", "type": "MaaDependencyNoAvx", "configuration": { "include": [ @@ -59,7 +58,7 @@ } }, { - "name_template": "MaaResource-{VERSION}", + "name_template": "MAA-Resource-{VERSION}", "type": "MaaResource", "configuration": { "include": [ @@ -71,7 +70,7 @@ } }, { - "name_template": "MaaDebugSymbol-{VERSION}", + "name_template": "MAA-DebugSymbol-Win-x64-{VERSION}", "type": "MaaDebugSymbol", "configuration": { "include": [ @@ -79,4 +78,4 @@ ] } } -] +] \ No newline at end of file diff --git a/src/MeoAsstGui/MeoAsstGui.csproj b/src/MeoAsstGui/MeoAsstGui.csproj index 22c67441f8..4e095857dd 100644 --- a/src/MeoAsstGui/MeoAsstGui.csproj +++ b/src/MeoAsstGui/MeoAsstGui.csproj @@ -465,7 +465,6 @@ xcopy /e /y /i /c "$(ProjectDir)..\..\3rdparty\tools" "$(TargetDir)" -xcopy /e /y /i /c "$(ProjectDir)..\..\tools\CopilotDesinger\copilot-designer-deprecated" "$(TargetDir)\作业制作器" xcopy /e /y /i /c "$(ProjectDir)..\..\src\Python" "$(TargetDir)\Python" \ No newline at end of file diff --git a/tools/MaaBuilder/Build.cs b/tools/MaaBuilder/Build.cs index 6ae652be8d..f071acf209 100644 --- a/tools/MaaBuilder/Build.cs +++ b/tools/MaaBuilder/Build.cs @@ -33,7 +33,7 @@ public partial class Build : NukeBuild const string MasterBranch = "master"; const string DevBranch = "dev"; - const string MaaDevBundlePackageNameTemplate = "MaaBundle-Dev-{VERSION}"; + const string MaaDevBundlePackageNameTemplate = "MAA-Dev-Win-x64-{VERSION}"; string Version = ""; string ChangeLog = "";