Merge pull request 'Jenkinsfile' (#263 ) from master into release

Reviewed-on: #263
Jenkinsfile
2024-11-28 12:44:38 +03:00 · 2024-11-28 12:44:29 +03:00
1 changed files with 3 additions and 3 deletions
--- a/6
+++ b/6
@@ -13,8 +13,8 @@ def build_docker(dist, release_dir, is_testing) {
 	if (env.DOCKER_PREFIX) {
 		args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
 	}
-	if (env.GIT_LOCAL_BRANCH) {
-		args += " --build-arg BRANCH=${env.GIT_LOCAL_BRANCH}"
+	if (env.BRANCH_NAME) {
+		args += " --build-arg BRANCH=${env.BRANCH_NAME}"
 	}
 	args += " --build-arg IMAGE_FROM=${dist.docker_image}"
 	args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}"
@@ -31,7 +31,7 @@ node {
 		checkout scm
 	}
 		
-	def currentBranch = "${env.GIT_LOCAL_BRANCH}"
+	def currentBranch = "${env.BRANCH_NAME}"
 	def is_testing = currentBranch.toLowerCase().contains("test")

 	def pl = new org.SHS.Platforms(this)
Author	SHA1	Message	Date
Пелипенко Иван	566499fd2b	Merge pull request 'Jenkinsfile' (#263 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit Details Reviewed-on: #263	2024-11-28 12:44:38 +03:00
peri4	40f2a424ac	Jenkinsfile	2024-11-28 12:44:29 +03:00