Skip to content

Commit 7b225f5

Browse files
authored
Merge pull request #2352 from jimklimov/Jenkinsfile-revise
Update Jenkinsfile-dynamatrix
2 parents 8b90711 + 64b5f68 commit 7b225f5

1 file changed

Lines changed: 16 additions & 9 deletions

File tree

Jenkinsfile-dynamatrix

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -478,8 +478,8 @@ set | sort -n """
478478
// BUILD_TYPE=default-tgt:distcheck-light + NO_PKG_CONFIG=true ?
479479
],
480480
dynamatrixAxesCommonEnv: [
481-
['LANG=C','LC_ALL=C','TZ=UTC'
482-
//,'BUILD_WARNFATAL=yes','BUILD_WARNOPT=hard'
481+
['LANG=C','LC_ALL=C','TZ=UTC','BUILD_WARNFATAL=yes'
482+
//,'BUILD_WARNOPT=hard'
483483
]
484484
],
485485
allowedFailure: [
@@ -527,8 +527,8 @@ set | sort -n """
527527
'BUILD_TYPE': ['default-tgt:cppcheck']
528528
],
529529
dynamatrixAxesCommonEnv: [
530-
['LANG=C','LC_ALL=C','TZ=UTC', 'DO_CLEAN_CHECK=no'
531-
//,'BUILD_WARNFATAL=yes','BUILD_WARNOPT=hard'
530+
['LANG=C','LC_ALL=C','TZ=UTC', 'DO_CLEAN_CHECK=no', 'BUILD_WARNFATAL=yes'
531+
//,'BUILD_WARNOPT=hard'
532532
]
533533
],
534534
allowedFailure: [
@@ -685,7 +685,8 @@ set | sort -n """
685685
],
686686
dynamatrixAxesCommonEnv: [
687687
['LANG=C','LC_ALL=C','TZ=UTC',
688-
'BUILD_WARNFATAL=yes','BUILD_WARNOPT=minimal'
688+
'BUILD_WARNFATAL=yes'
689+
//,'BUILD_WARNOPT=medium'
689690
]
690691
],
691692
allowedFailure: [
@@ -726,9 +727,14 @@ set | sort -n """
726727
dynamatrixAxesCommonEnv: [
727728
['LANG=C','LC_ALL=C','TZ=UTC',
728729
// Build in a subdirectory to check that out-of-dir
729-
// builds are healthy too
730+
// builds are healthy too.
731+
// NOTE: It would be useful to also have a recipe to build
732+
// "completely out-of-tree", in a different filesystem (to
733+
// make sure we do not rely on hard-links, relative paths,
734+
// etc.)
730735
'CI_BUILDDIR=obj',
731-
'BUILD_WARNFATAL=yes','BUILD_WARNOPT=minimal'
736+
'BUILD_WARNFATAL=yes'
737+
//,'BUILD_WARNOPT=minimal'
732738
]
733739
],
734740
allowedFailure: [
@@ -767,7 +773,8 @@ set | sort -n """
767773
],
768774
dynamatrixAxesCommonEnv: [
769775
['LANG=C','LC_ALL=C','TZ=UTC',
770-
'BUILD_WARNFATAL=yes','BUILD_WARNOPT=minimal'
776+
'BUILD_WARNFATAL=yes'
777+
//,'BUILD_WARNOPT=minimal'
771778
]
772779
],
773780
allowedFailure: [
@@ -1213,7 +1220,7 @@ set | sort -n """
12131220
'bodyParStages': dynacfgPipeline.slowBuildDefaultBody_ci_build
12141221
] // one slowBuild filter configuration
12151222

1216-
,[name: 'Strict C and GNU standard builds on cross-Windows platforms (Linux+mingw), without distcheck and docs (allowed to fail)',
1223+
,[name: (dynacfgPipeline.disableStrictCIBuild_CrossWindows ? '' : 'Strict C and ') + 'GNU standard builds on cross-Windows platforms (Linux+mingw), without distcheck and docs (allowed to fail)',
12171224
disabled: dynacfgPipeline.disableSlowBuildCIBuild,
12181225
//branchRegexSource: ~/^(PR-.+|.*fightwarn.*|.*Windows.*)$/,
12191226
//branchRegexTarget: ~/fightwarn|Windows-.*/,

0 commit comments

Comments
 (0)