Merge pull request 'pip, Jenkinsfile' (#264 ) from master into release

Reviewed-on: #264
pip, Jenkinsfile
2024-11-28 13:36:21 +03:00 · 2024-11-28 13:36:11 +03:00
2 changed files with 4 additions and 2 deletions
--- a/4
+++ b/4
@@ -14,7 +14,9 @@ def build_docker(dist, release_dir, is_testing) {
 		args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
 	}
 	if (env.BRANCH_NAME) {
-		args += " --build-arg BRANCH=${env.BRANCH_NAME}"
+		if ("${env.BRANCH_NAME}" != "shstk") {
+			args += " --build-arg BRANCH=${env.BRANCH_NAME}"
+		}
 	}
 	args += " --build-arg IMAGE_FROM=${dist.docker_image}"
 	args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}"
--- a/2
+++ b/2
Author	SHA1	Message	Date
Пелипенко Иван	f710464480	Merge pull request 'pip, Jenkinsfile' (#264 ) from master into release Some checks failed SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit Details Reviewed-on: #264	2024-11-28 13:36:21 +03:00
peri4	72c82b787c	pip, Jenkinsfile	2024-11-28 13:36:11 +03:00