Skip to content

Commit 276a192

Browse files
authored
Merge pull request #84 from ethosengine/claude/fix-jenkinsfile-ui-playground-01MeVs2ZGSMenYfhpxP8Xktd
Fix UI playground components in Jenkinsfile
2 parents 6ad648a + 3e6ed81 commit 276a192

File tree

1 file changed

+32
-20
lines changed

1 file changed

+32
-20
lines changed

Jenkinsfile

Lines changed: 32 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -424,11 +424,14 @@ BRANCH_NAME=${env.BRANCH_NAME}"""
424424

425425
stage('Install UI Playground Dependencies') {
426426
when {
427-
anyOf {
428-
changeset "elohim-library/**"
429-
changeset "elohim-ui-playground/**"
430-
changeset "images/Dockerfile.ui-playground"
431-
changeset "images/nginx-ui-playground.conf"
427+
allOf {
428+
not { branch 'main' }
429+
anyOf {
430+
changeset "elohim-library/**"
431+
changeset "elohim-ui-playground/**"
432+
changeset "images/Dockerfile.ui-playground"
433+
changeset "images/nginx-ui-playground.conf"
434+
}
432435
}
433436
}
434437
steps {
@@ -445,11 +448,14 @@ BRANCH_NAME=${env.BRANCH_NAME}"""
445448

446449
stage('Build UI Playground') {
447450
when {
448-
anyOf {
449-
changeset "elohim-library/**"
450-
changeset "elohim-ui-playground/**"
451-
changeset "images/Dockerfile.ui-playground"
452-
changeset "images/nginx-ui-playground.conf"
451+
allOf {
452+
not { branch 'main' }
453+
anyOf {
454+
changeset "elohim-library/**"
455+
changeset "elohim-ui-playground/**"
456+
changeset "images/Dockerfile.ui-playground"
457+
changeset "images/nginx-ui-playground.conf"
458+
}
453459
}
454460
}
455461
steps {
@@ -470,11 +476,14 @@ BRANCH_NAME=${env.BRANCH_NAME}"""
470476

471477
stage('Build UI Playground Image') {
472478
when {
473-
anyOf {
474-
changeset "elohim-library/**"
475-
changeset "elohim-ui-playground/**"
476-
changeset "images/Dockerfile.ui-playground"
477-
changeset "images/nginx-ui-playground.conf"
479+
allOf {
480+
not { branch 'main' }
481+
anyOf {
482+
changeset "elohim-library/**"
483+
changeset "elohim-ui-playground/**"
484+
changeset "images/Dockerfile.ui-playground"
485+
changeset "images/nginx-ui-playground.conf"
486+
}
478487
}
479488
}
480489
steps {
@@ -520,11 +529,14 @@ BRANCH_NAME=${env.BRANCH_NAME}"""
520529

521530
stage('Push UI Playground to Harbor Registry') {
522531
when {
523-
anyOf {
524-
changeset "elohim-library/**"
525-
changeset "elohim-ui-playground/**"
526-
changeset "images/Dockerfile.ui-playground"
527-
changeset "images/nginx-ui-playground.conf"
532+
allOf {
533+
not { branch 'main' }
534+
anyOf {
535+
changeset "elohim-library/**"
536+
changeset "elohim-ui-playground/**"
537+
changeset "images/Dockerfile.ui-playground"
538+
changeset "images/nginx-ui-playground.conf"
539+
}
528540
}
529541
}
530542
steps {

0 commit comments

Comments
 (0)