build: rename CI package

This commit is contained in:
MistEO
2022-10-16 02:05:55 +08:00
parent b21d0da75a
commit 7d8bccf581
9 changed files with 44 additions and 44 deletions

View File

@@ -28,7 +28,7 @@ jobs:
macos-latest:
runs-on: macos-12
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive
- name: Cache Homebrew
@@ -49,7 +49,7 @@ jobs:
- name: Build MeoAsstMac
working-directory: src/MeoAsstMac
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
- uses: actions/upload-artifact@v3
with:
name: MAA-macOS
name: MAA-macos
path: src/MeoAsstMac/DerivedData/Build/Products/Debug

View File

@@ -9,12 +9,12 @@
#
# - To trigger manual generation invoke:
#
# nuke --generate-configuration GitHubActions_dev-build --host GitHubActions
# nuke --generate-configuration GitHubActions_dev-build-win --host GitHubActions
#
# </auto-generated>
# ------------------------------------------------------------------------------
name: dev-build
name: dev-build-win
on:
push:
@@ -55,9 +55,9 @@ jobs:
name: windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
.nuke/temp
@@ -69,7 +69,7 @@ jobs:
Reason: ${{ github.event.inputs.Reason }}
ReleaseSimulation: ${{ github.event.inputs.ReleaseSimulation }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v3
with:
name: MAA-Win-x64
name: MAA-win-x64
path: artifacts

View File

@@ -9,7 +9,7 @@ jobs:
name: macos-latest
runs-on: macos-12
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
submodules: recursive
- name: 'Install Developer ID Certificate'
@@ -47,7 +47,7 @@ jobs:
- name: Upload products
uses: actions/upload-artifact@v3
with:
name: MaaBundle-darwin
name: MAA-macos
path: |
src/MeoAsstMac/MeoAsstMac.dmg
src/MeoAsstMac/MeoAsstMac.xcarchive/dSYMs/MeoAsstMac.app.dSYM.zip
@@ -61,12 +61,12 @@ jobs:
run: |
GIT_TAG=${GITHUB_REF#refs/*/}
echo "GIT_TAG=${GIT_TAG}" >> $GITHUB_ENV
echo "APP_DMG=MAA-macOS-${GIT_TAG}.dmg" >> $GITHUB_ENV
echo "APP_SYM=MAA-DebugSymbol-macOS-${GIT_TAG}.zip" >> $GITHUB_ENV
echo "APP_DMG=MAA-${GIT_TAG}-macos.dmg" >> $GITHUB_ENV
echo "APP_SYM=MAAComponent-DebugSymbol-${GIT_TAG}-macos.zip" >> $GITHUB_ENV
- name: Download artifacts
uses: actions/download-artifact@v3
with:
name: MAA-macOS
name: MAA-macos
- name: 'Verify image'
run: |
mv MeoAsstMac.dmg $APP_DMG
@@ -84,7 +84,7 @@ jobs:
uses: svenstaro/upload-release-action@v2
with:
repo_token: ${{ secrets.GITHUB_TOKEN }}
file: 'MAA*-macOS-${{ env.GIT_TAG }}*'
file: 'MAA*${{ env.GIT_TAG }}-macos*'
file_glob: true
tag: ${{ env.GIT_TAG }}
overwrite: true

View File

@@ -9,12 +9,12 @@
#
# - To trigger manual generation invoke:
#
# nuke --generate-configuration GitHubActions_release-maa --host GitHubActions
# nuke --generate-configuration GitHubActions_release-maa-win --host GitHubActions
#
# </auto-generated>
# ------------------------------------------------------------------------------
name: release-maa
name: release-maa-win
on:
push:
@@ -26,9 +26,9 @@ jobs:
name: windows-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Cache .nuke/temp, ~/.nuget/packages
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
.nuke/temp
@@ -39,7 +39,7 @@ jobs:
env:
PUBLISH_GH_PAT: ${{ secrets.PUBLISH_GH_PAT }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/upload-artifact@v1
- uses: actions/upload-artifact@v3
with:
name: artifacts
name: MAA-win-x64
path: artifacts

View File

@@ -1,6 +1,6 @@
[
{
"name_template": "MAA-Win-x64-{VERSION}",
"name_template": "MAA-{VERSION}-win-x64",
"type": "MaaBundle",
"configuration": {
"include": [
@@ -9,7 +9,7 @@
}
},
{
"name_template": "MAA-OTA-Win-x64-{VERSION}",
"name_template": "MAAComponent-OTA-{VERSION}-win-x64",
"type": "MaaBundleOta",
"configuration": {
"include": [
@@ -23,7 +23,7 @@
}
},
{
"name_template": "MAA-Core-Win-x64-{VERSION}",
"name_template": "MAAComponent-Core-{VERSION}-win-x64",
"type": "MaaCore",
"configuration": {
"include": [
@@ -32,7 +32,7 @@
}
},
{
"name_template": "MAA-Dependency-Win-x64-{VERSION}",
"name_template": "MAAComponent-Dependency-{VERSION}-win-x64",
"type": "MaaDependency",
"configuration": {
"include": [
@@ -47,7 +47,7 @@
}
},
{
"name_template": "MAA-DependencyNoAvx-Win-x64-{VERSION}",
"name_template": "MAAComponent-DependencyNoAvx-{VERSION}-win-x64",
"type": "MaaDependencyNoAvx",
"configuration": {
"include": [
@@ -58,7 +58,16 @@
}
},
{
"name_template": "MAA-Resource-{VERSION}",
"name_template": "MAAComponent-DebugSymbol-{VERSION}-win-x64",
"type": "MaaDebugSymbol",
"configuration": {
"include": [
"**/*.pdb"
]
}
},
{
"name_template": "MAAComponent-Resource-{VERSION}",
"type": "MaaResource",
"configuration": {
"include": [
@@ -68,14 +77,5 @@
"**/PaddleOCR/**"
]
}
},
{
"name_template": "MAA-DebugSymbol-Win-x64-{VERSION}",
"type": "MaaDebugSymbol",
"configuration": {
"include": [
"**/*.pdb"
]
}
}
]
]

View File

@@ -6,8 +6,8 @@ namespace MaaBuilder;
[TypeConverter(typeof(TypeConverter<ActionConfiguration>))]
public class ActionConfiguration : Enumeration
{
public static readonly ActionConfiguration DevBuild = new() { Value = "dev-build" };
public static readonly ActionConfiguration ReleaseMaa = new() { Value = "release-maa" };
public static readonly ActionConfiguration DevBuild = new() { Value = "dev-build-win" };
public static readonly ActionConfiguration ReleaseMaa = new() { Value = "release-maa-win" };
public static implicit operator string(ActionConfiguration configuration)
{
@@ -16,8 +16,8 @@ public class ActionConfiguration : Enumeration
public static explicit operator ActionConfiguration(string value) => value switch
{
"dev-build" => DevBuild,
"release-maa" => ReleaseMaa,
"dev-build-win" => DevBuild,
"release-maa-win" => ReleaseMaa,
_ => null
};
}

View File

@@ -33,7 +33,7 @@ public partial class Build : NukeBuild
const string MasterBranch = "master";
const string DevBranch = "dev";
const string MaaDevBundlePackageNameTemplate = "MAA-Dev-Win-x64-{VERSION}";
const string MaaDevBundlePackageNameTemplate = "MAA-{VERSION}-win-x64-Dev";
string Version = "";
string ChangeLog = "";

View File

@@ -3,7 +3,7 @@ using Nuke.Common.CI.GitHubActions;
namespace MaaBuilder;
[GitHubActions(
name: "dev-build",
name: "dev-build-win",
image: GitHubActionsImage.WindowsLatest,
OnPushBranchesIgnore = new[] { MasterBranch },
OnPullRequestBranches = new[] { DevBranch },

View File

@@ -3,7 +3,7 @@ using Nuke.Common.CI.GitHubActions;
namespace MaaBuilder;
[GitHubActions(
name: "release-maa",
name: "release-maa-win",
image: GitHubActionsImage.WindowsLatest,
OnPushTags = new[] { "v*" },
InvokedTargets = new[] { nameof(ReleaseMaa) },