Merge branch 'master' into dependabot/maven/commons-beanutils-commons-beanutils-1.10.1

mergify[bot] · web-flow · commit eea980712e37 · 2025-04-30T02:59:57.000Z
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -60,6 +60,7 @@ pipeline {
                             echo "no change，skip build"
                             currentBuild.getRawBuild().getExecutor().interrupt(Result.NOT_BUILT)
                             sleep(1)
+                            cleanWs()
                         }   
                     }
                 }
@@ -241,6 +242,9 @@ pipeline {
                  script {
                      sh "rm smcTool*.zip"
                      sh "rm qeTool*.zip" 
+                     sh "rm *linux*17*.tar.gc" 
+                     sh "rm *mac*17*.tar.gc"
+                     sh "rm *windows*17*.zip"
                  }
              }
          }

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ pipeline {`
`60`	`60`	`echo "no change，skip build"`
`61`	`61`	`currentBuild.getRawBuild().getExecutor().interrupt(Result.NOT_BUILT)`
`62`	`62`	`sleep(1)`
	`63`	`+ cleanWs()`
`63`	`64`	`}`
`64`	`65`	`}`
`65`	`66`	`}`
`@@ -241,6 +242,9 @@ pipeline {`
`241`	`242`	`script {`
`242`	`243`	`sh "rm smcTool*.zip"`
`243`	`244`	`sh "rm qeTool*.zip"`
	`245`	`+ sh "rm linux17*.tar.gc"`
	`246`	`+ sh "rm mac17*.tar.gc"`
	`247`	`+ sh "rm windows17*.zip"`
`244`	`248`	`}`
`245`	`249`	`}`
`246`	`250`	`}`