LCPQ
/
dft_tools
mirror of https://github.com/triqs/dft_tools
3
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'app4triqs-remote/3.0.x' into 3.0.x

This commit is contained in:
Nils Wentzell 2021-06-09 15:06:03 -04:00
parent 1dfe861164 7a69fb1a47
commit 8bcb6f3391
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@ -11,6 +11,6 @@ RUN chown build .
USER build
ARG BUILD_DOC=0
ARG BUILD_ID
RUN cmake $SRC/$APPNAME -DTRIQS_ROOT=${INSTALL} -DBuild_Documentation=${BUILD_DOC} -DBuild_Deps=Always && make -j2 || make -j1 VERBOSE=1
RUN cmake $SRC/$APPNAME -DTRIQS_ROOT=${INSTALL} -DBuild_Documentation=${BUILD_DOC} -DBuild_Deps=Always && make -j4 || make -j1 VERBOSE=1
USER root
RUN make install

12
Jenkinsfile vendored
View File

@ -29,8 +29,8 @@ def dockerPlatforms = ["ubuntu-clang", "ubuntu-gcc", "centos-gcc"]
/* .each is currently broken in jenkins */
for (int i = 0; i < dockerPlatforms.size(); i++) {
def platform = dockerPlatforms[i]
platforms[platform] = { -> node('docker') {
stage(platform) { timeout(time: 1, unit: 'HOURS') {
platforms[platform] = { -> node('linux && docker && triqs') {
stage(platform) { timeout(time: 1, unit: 'HOURS') { ansiColor('xterm') {
checkout scm
/* construct a Dockerfile for this base */
sh """
@ -47,7 +47,7 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
if (!keepInstall) {
sh "docker rmi --no-prune ${img.imageName()}"
}
} }
} } }
} }
}
@ -60,7 +60,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
def platformEnv = osxPlatforms[i]
def platform = platformEnv[0]
platforms["osx-$platform"] = { -> node('osx && triqs') {
stage("osx-$platform") { timeout(time: 1, unit: 'HOURS') {
stage("osx-$platform") { timeout(time: 1, unit: 'HOURS') { ansiColor('xterm') {
def srcDir = pwd()
def tmpDir = pwd(tmp:true)
def buildDir = "$tmpDir/build"
@ -97,7 +97,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
} }
sh "make install"
} }
} }
} } }
} }
}
@ -105,7 +105,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
def error = null
try {
parallel platforms
if (keepInstall) { node("docker") {
if (keepInstall) { node('linux && docker && triqs') {
/* Publish results */
stage("publish") { timeout(time: 5, unit: 'MINUTES') {
def commit = sh(returnStdout: true, script: "git rev-parse HEAD").trim()