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

Reviewed-on: #264
This commit was merged in pull request #264.
This commit is contained in:
2024-11-28 13:36:21 +03:00
2 changed files with 4 additions and 2 deletions

2
Jenkinsfile vendored
View File

@@ -14,8 +14,10 @@ def build_docker(dist, release_dir, is_testing) {
args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
}
if (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}"
args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}"

2
pip

Submodule pip updated: 4f934fef35...cae264a77b