Merge pull request #10502 from yongyiduan/pac_fix_github

feat：流水线版本管理机制 #8161 优化stage label
TencentBlueKing · Jun 11, 2024 · f7ba547 · f7ba547
2 parents e237784 + 8ace8c3
commit f7ba547
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...n-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/StageTransfer.kt b/...n-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/transfer/StageTransfer.kt
@@ -320,9 +320,9 @@ class StageTransfer @Autowired(required = false) constructor(
         )
     }
 
-    private fun maskYamlStageLabel(tags: List<String>?): List<String> {
+    private fun maskYamlStageLabel(tags: List<String?>?): List<String> {
         if (tags.isNullOrEmpty()) return emptyList()
-        return tags.map { StageLabel.parseById(it).value }
+        return tags.filterNotNull().map { StageLabel.parseById(it).value }
     }
 
     private fun getCheckInForStage(stage: Stage): PreStageCheck? {

diff --git a/...-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/utils/ScriptYmlUtils.kt b/...-pipeline-yaml/src/main/kotlin/com/tencent/devops/process/yaml/v3/utils/ScriptYmlUtils.kt
@@ -570,7 +570,7 @@ object ScriptYmlUtils {
 
     private fun formatStageLabel(labels: Any?): List<String> {
         if (labels == null) {
-            return emptyList()
+            return listOf(StageLabel.BUILD.id)
         }
 
         val transLabels = anyToListString(labels)
@@ -586,6 +586,9 @@ object ScriptYmlUtils {
                 )
             }
         }
+        if (newLabels.isEmpty()) {
+            newLabels.add(StageLabel.BUILD.id)
+        }
 
         return newLabels
     }