From efc5f25ad24d5ab72d7c54ef99091bdf3b519f05 Mon Sep 17 00:00:00 2001 From: randychen Date: Tue, 18 Oct 2022 11:17:04 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=20[Stream]=E4=BF=AE=E6=94=B9=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=9E=84=E5=BB=BA=E9=95=9C=E5=83=8F=E7=89=88=E6=9C=AC?= =?UTF-8?q?=20#7806?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- support-files/templates/#etc#ci#application-stream.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support-files/templates/#etc#ci#application-stream.yml b/support-files/templates/#etc#ci#application-stream.yml index ac449eb02cb..db457ed2354 100644 --- a/support-files/templates/#etc#ci#application-stream.yml +++ b/support-files/templates/#etc#ci#application-stream.yml @@ -30,7 +30,7 @@ cron: # stream 运行时的默认镜像 container: - defaultImage: bkci/ci:latest + defaultImage: bkci/ci:ubuntu github: redirectUrl: __BK_CI_STREAM_URL__/auth/api/external/third/login?code=%s&userId=%s&type=%s From 3a8a6879d4d92a8b3bc81177edf8d02cba551ac7 Mon Sep 17 00:00:00 2001 From: randychen Date: Tue, 18 Oct 2022 11:19:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=20[Stream]=E4=BF=AE=E6=94=B9=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=9E=84=E5=BB=BA=E9=95=9C=E5=83=8F=E7=89=88=E6=9C=AC?= =?UTF-8?q?=20#7806?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/tencent/devops/stream/service/StreamHistoryService.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/service/StreamHistoryService.kt b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/service/StreamHistoryService.kt index fd6133e8363..9cb58f5af1b 100644 --- a/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/service/StreamHistoryService.kt +++ b/src/backend/ci/core/stream/biz-stream/src/main/kotlin/com/tencent/devops/stream/service/StreamHistoryService.kt @@ -170,6 +170,7 @@ class StreamHistoryService @Autowired constructor( ) } + @Suppress("LongMethod") fun getAllBuildBranchList( userId: String, gitProjectId: Long,