From d47a747a28489dc7927e2a7bdafca8592400aade Mon Sep 17 00:00:00 2001 From: Liam Sho Date: Thu, 14 Jul 2022 01:17:35 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20checksum.txt=20?= =?UTF-8?q?=E6=9C=AA=E4=B8=8A=E4=BC=A0=E8=87=B3=20Release=20=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/MaaBuilder/Build.Helper.Github.cs | 2 +- tools/MaaBuilder/Build.Job.Publish.cs | 9 +-------- tools/MaaBuilder/Build.cs | 1 - tools/MaaBuilder/BuildParameters.cs | 4 ---- 4 files changed, 2 insertions(+), 14 deletions(-) diff --git a/tools/MaaBuilder/Build.Helper.Github.cs b/tools/MaaBuilder/Build.Helper.Github.cs index 05be701cb9..e390cd9406 100644 --- a/tools/MaaBuilder/Build.Helper.Github.cs +++ b/tools/MaaBuilder/Build.Helper.Github.cs @@ -12,7 +12,7 @@ public partial class Build void CreateGitHubRelease(string repo, string commitish, string releaseName) { - var assets = Parameters.ArtifactOutput.GlobFiles("*.zip"); + var assets = Parameters.ArtifactOutput.GlobFiles("*.zip", "checksum.txt"); var release = new NewRelease(Version) { diff --git a/tools/MaaBuilder/Build.Job.Publish.cs b/tools/MaaBuilder/Build.Job.Publish.cs index 6ca68e91a0..dd34619885 100644 --- a/tools/MaaBuilder/Build.Job.Publish.cs +++ b/tools/MaaBuilder/Build.Job.Publish.cs @@ -30,6 +30,7 @@ public partial class Build Credentials = new Credentials(Parameters.GitHubPersonalAccessToken) }; + // ReSharper disable once InvertIf if (Parameters.GhActionName == ActionConfiguration.ReleaseMaa) { Information($"运行 ReleaseMaa 将在 {Parameters.MainRepo} 创建 Release {Parameters.GhTag}"); @@ -38,13 +39,5 @@ public partial class Build return; } - - // ReSharper disable once InvertIf - if (Parameters.GhActionName == ActionConfiguration.ReleaseMaaResource) - { - Information($"运行 ReleaseMaaResource 将在 {Parameters.MaaResourceReleaseRepo} 创建 Release {Version}"); - - CreateGitHubRelease(Parameters.MaaResourceReleaseRepo, "main", Version); - } }); } diff --git a/tools/MaaBuilder/Build.cs b/tools/MaaBuilder/Build.cs index 7eeb2c97de..cb312c4e00 100644 --- a/tools/MaaBuilder/Build.cs +++ b/tools/MaaBuilder/Build.cs @@ -62,7 +62,6 @@ public partial class Build : NukeBuild Information("2. 仓库"); Information($"主仓库:{Parameters.MainRepo ?? "Null"}"); - Information($"MaaResource 发布仓库:{Parameters.MaaResourceReleaseRepo ?? "Null"}"); Information($"主分支:{Parameters.MasterBranchRef ?? "Null"}"); Information($"开发分支:{Parameters.DevBranchRef ?? "Null"}"); Information($"发布 Tag 前缀:{Parameters.ReleaseTagRefPrefix ?? "Null"}"); diff --git a/tools/MaaBuilder/BuildParameters.cs b/tools/MaaBuilder/BuildParameters.cs index 2dc48d0d91..cbfa522335 100644 --- a/tools/MaaBuilder/BuildParameters.cs +++ b/tools/MaaBuilder/BuildParameters.cs @@ -65,7 +65,6 @@ public partial class Build public string MasterBranchRef { get; } public string DevBranchRef { get; } public string ReleaseTagRefPrefix { get; } - public string MaaResourceReleaseRepo { get; } // 路径 public AbsolutePath BuildOutput { get; } @@ -106,7 +105,6 @@ public partial class Build // 仓库 MainRepo = "MaaAssistantArknights/MaaAssistantArknights"; - MaaResourceReleaseRepo = "MaaAssistantArknights/MaaResourceRelease"; MasterBranchRef = "refs/heads/master"; DevBranchRef = "refs/heads/dev"; @@ -201,8 +199,6 @@ public partial class Build { // Fork MainRepo = b.GitHubActions.Repository; - var repoOwner = MainRepo.Split("/")[0]; - MaaResourceReleaseRepo = $"{repoOwner}/MaaResourceRelease"; } // 若是 DevBuild,Branch 必须不为 Master,或者是 PR 至 Dev,又或者是手动触发