luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip' of github.com:KLayout/klayout into wip

This commit is contained in:
Matthias Koefferlein 2022-12-18 15:35:06 +01:00
parent de784de7ea b7b26b7ecd
commit b958b560f0
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -54,7 +54,7 @@ node("master") {
withDockerContainer(image: "jenkins-${target}-basic") { withDockerContainer(image: "jenkins-${target}-basic") {
// from shared library // from shared library
installtest(target, target_dir) installtest_nopython(target, target_dir)
} }
}) })

16
Jenkinsfile-msvc2017
View File

@ -22,10 +22,8 @@ node("master") {
stage("Building target ${target}") { stage("Building target ${target}") {
withDockerContainer(image: "jenkins-${target}") { // from shared library
// from shared library build(target, target_dir)
build(target, target_dir)
}
} }
@ -43,19 +41,15 @@ node("master") {
"Unit testing": { "Unit testing": {
ut_result = "no-result" ut_result = "no-result"
withDockerContainer(image: "jenkins-${target}") { ut_result = run_ut(target)
ut_result = run_ut(target)
}
junit(testResults: ut_result) junit(testResults: ut_result)
}, },
"Installtest": { "Installtest": {
withDockerContainer(image: "jenkins-${target}-basic") { // from shared library
// from shared library installtest_nopython(target, target_dir)
installtest(target, target_dir)
}
}) })