fix: refs #8715 update COMPOSE_TAG logic in Jenkinsfile to use CHANGE_TARGET for diff output
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit
Details
gitea/salix-front/pipeline/pr-dev Something is wrong with the build of this commit
Details
This commit is contained in:
parent
a34579e718
commit
5e800741e0
|
@ -22,6 +22,7 @@ node {
|
|||
|
||||
IS_PROTECTED_BRANCH = PROTECTED_BRANCH.contains(env.BRANCH_NAME)
|
||||
IS_LATEST = ['master', 'main'].contains(env.BRANCH_NAME)
|
||||
COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
|
||||
|
||||
// https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
|
||||
echo "NODE_NAME: ${env.NODE_NAME}"
|
||||
|
@ -82,7 +83,7 @@ pipeline {
|
|||
steps {
|
||||
script {
|
||||
def diffOutput = sh(
|
||||
script: "git fetch origin ${TARGET_BRANCH} && git diff --name-only origin/${TARGET_BRANCH}",
|
||||
script: "git diff --name-only origin/${COMPOSE_TAG}",
|
||||
returnStdout: true
|
||||
).trim().split('\n')
|
||||
echo "DIFF: ${diffOutput}"
|
||||
|
@ -135,7 +136,6 @@ pipeline {
|
|||
script {
|
||||
sh 'rm -f junit/e2e-*.xml'
|
||||
sh 'rm -rf test/cypress/screenshots'
|
||||
env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
|
||||
|
||||
def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
|
||||
|
||||
|
|
Loading…
Reference in New Issue