mirror of https://github.com/KLayout/klayout.git
Merge branch 'wip' of github.com:KLayout/klayout into wip
This commit is contained in:
commit
b958b560f0
|
|
@ -54,7 +54,7 @@ node("master") {
|
|||
|
||||
withDockerContainer(image: "jenkins-${target}-basic") {
|
||||
// from shared library
|
||||
installtest(target, target_dir)
|
||||
installtest_nopython(target, target_dir)
|
||||
}
|
||||
|
||||
})
|
||||
|
|
|
|||
|
|
@ -22,10 +22,8 @@ node("master") {
|
|||
|
||||
stage("Building target ${target}") {
|
||||
|
||||
withDockerContainer(image: "jenkins-${target}") {
|
||||
// from shared library
|
||||
build(target, target_dir)
|
||||
}
|
||||
// from shared library
|
||||
build(target, target_dir)
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -43,19 +41,15 @@ node("master") {
|
|||
"Unit testing": {
|
||||
|
||||
ut_result = "no-result"
|
||||
withDockerContainer(image: "jenkins-${target}") {
|
||||
ut_result = run_ut(target)
|
||||
}
|
||||
ut_result = run_ut(target)
|
||||
|
||||
junit(testResults: ut_result)
|
||||
|
||||
},
|
||||
"Installtest": {
|
||||
|
||||
withDockerContainer(image: "jenkins-${target}-basic") {
|
||||
// from shared library
|
||||
installtest(target, target_dir)
|
||||
}
|
||||
// from shared library
|
||||
installtest_nopython(target, target_dir)
|
||||
|
||||
})
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue