From 90476c250daf8525a7fe2445b8945c9dbedd8f1f Mon Sep 17 00:00:00 2001 From: zpc Date: Tue, 9 Jul 2024 14:11:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/PublishController.cs | 23 ++++++++++++++++++- src/CodeRelease/CodeRelease/appsettings.json | 10 +++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/src/CodeRelease/CodeRelease/Controllers/PublishController.cs b/src/CodeRelease/CodeRelease/Controllers/PublishController.cs index 98541b4..21988ca 100644 --- a/src/CodeRelease/CodeRelease/Controllers/PublishController.cs +++ b/src/CodeRelease/CodeRelease/Controllers/PublishController.cs @@ -1,4 +1,4 @@ -using CodeRelease.BLL; +using CodeRelease.BLL; using CodeRelease.Model; using CodeRelease.Utile; @@ -8,6 +8,8 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; +using System; + namespace CodeRelease.Controllers @@ -80,7 +82,26 @@ namespace CodeRelease.Controllers return obj; } } + else if (!string.IsNullOrEmpty(releaseAction.Release.TargetCommitish)) + { + var version = releaseAction.Release.TagName; + var download = giteaWebhookConfig.BrowserDownloadFileUrl + version + "/"; + if (!Directory.Exists(download)) + { + Directory.CreateDirectory(download); + } + FileDownloader fileDownloader = new FileDownloader(); + //giteaWebhookConfig.BrowserDownloadFileUrl.Replace("{version}", version); + var mingling = giteaWebhookConfig.MakeFile + .Replace("{version}", version) + .Replace("{dir_file_path}", download + "/") + .Replace("{target_commitish}", releaseAction.Release.TargetCommitish); + LinuxExecuteCommand linuxExecuteCommand = new LinuxExecuteCommand(); + //make public version=0.0.1 dir_file_path=/ + var obj = await linuxExecuteCommand.ExecuteCommand(mingling); + return obj; + } } } diff --git a/src/CodeRelease/CodeRelease/appsettings.json b/src/CodeRelease/CodeRelease/appsettings.json index d87899f..0206d15 100644 --- a/src/CodeRelease/CodeRelease/appsettings.json +++ b/src/CodeRelease/CodeRelease/appsettings.json @@ -20,7 +20,7 @@ //make 文件位置 "MakeFile": "make public version={version} dir_file_path={dir_file_path} -f /disk/CodeRelease/test/makefile", //发布文件下载位置 - "BrowserDownloadFileUrl": "I:/Gitea/test/disk/aiweb/" + "BrowserDownloadFileUrl": "" // }, { @@ -30,6 +30,14 @@ //发布文件下载位置 "BrowserDownloadFileUrl": "I:/Gitea/test/disk/aiweb/" // + }, + { + "Name": "miaoyu", + //make 文件位置 make public version=0.0.2 target_commitish=dev -f /disk/Public/miaoyu/makefile + "MakeFile": "make public version={version} target_commitish={target_commitish} -f /disk/Public/miaoyu/makefile", + //发布文件下载位置 + "BrowserDownloadFileUrl": "" + // } ]