Merge pull request 'pip, cd' (#262) from master into release
Some checks failed
SHS Gitea/shstk/pipeline/head Something is wrong with the build of this commit

Reviewed-on: #262
This commit was merged in pull request #262.
This commit is contained in:
2024-11-28 12:37:32 +03:00
3 changed files with 5 additions and 5 deletions

6
Jenkinsfile vendored
View File

@@ -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.BRANCH_NAME) {
args += " --build-arg BRANCH=${env.BRANCH_NAME}"
if (env.GIT_LOCAL_BRANCH) {
args += " --build-arg BRANCH=${env.GIT_LOCAL_BRANCH}"
}
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.BRANCH_NAME}"
def currentBranch = "${env.GIT_LOCAL_BRANCH}"
def is_testing = currentBranch.toLowerCase().contains("test")
def pl = new org.SHS.Platforms(this)

2
cd

Submodule cd updated: a3e88f792d...31bacbedae

2
pip

Submodule pip updated: 12114b3e77...4f934fef35