mirror of
https://github.com/triqs/dft_tools
synced 2024-09-01 08:43:41 +02:00
Merge remote-tracking branch 'app4triqs-remote/3.0.x' into 3.0.x
This commit is contained in:
commit
8bcb6f3391
@ -11,6 +11,6 @@ RUN chown build .
|
|||||||
USER build
|
USER build
|
||||||
ARG BUILD_DOC=0
|
ARG BUILD_DOC=0
|
||||||
ARG BUILD_ID
|
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
|
USER root
|
||||||
RUN make install
|
RUN make install
|
||||||
|
12
Jenkinsfile
vendored
12
Jenkinsfile
vendored
@ -29,8 +29,8 @@ def dockerPlatforms = ["ubuntu-clang", "ubuntu-gcc", "centos-gcc"]
|
|||||||
/* .each is currently broken in jenkins */
|
/* .each is currently broken in jenkins */
|
||||||
for (int i = 0; i < dockerPlatforms.size(); i++) {
|
for (int i = 0; i < dockerPlatforms.size(); i++) {
|
||||||
def platform = dockerPlatforms[i]
|
def platform = dockerPlatforms[i]
|
||||||
platforms[platform] = { -> node('docker') {
|
platforms[platform] = { -> node('linux && docker && triqs') {
|
||||||
stage(platform) { timeout(time: 1, unit: 'HOURS') {
|
stage(platform) { timeout(time: 1, unit: 'HOURS') { ansiColor('xterm') {
|
||||||
checkout scm
|
checkout scm
|
||||||
/* construct a Dockerfile for this base */
|
/* construct a Dockerfile for this base */
|
||||||
sh """
|
sh """
|
||||||
@ -47,7 +47,7 @@ for (int i = 0; i < dockerPlatforms.size(); i++) {
|
|||||||
if (!keepInstall) {
|
if (!keepInstall) {
|
||||||
sh "docker rmi --no-prune ${img.imageName()}"
|
sh "docker rmi --no-prune ${img.imageName()}"
|
||||||
}
|
}
|
||||||
} }
|
} } }
|
||||||
} }
|
} }
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -60,7 +60,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
|
|||||||
def platformEnv = osxPlatforms[i]
|
def platformEnv = osxPlatforms[i]
|
||||||
def platform = platformEnv[0]
|
def platform = platformEnv[0]
|
||||||
platforms["osx-$platform"] = { -> node('osx && triqs') {
|
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 srcDir = pwd()
|
||||||
def tmpDir = pwd(tmp:true)
|
def tmpDir = pwd(tmp:true)
|
||||||
def buildDir = "$tmpDir/build"
|
def buildDir = "$tmpDir/build"
|
||||||
@ -97,7 +97,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
|
|||||||
} }
|
} }
|
||||||
sh "make install"
|
sh "make install"
|
||||||
} }
|
} }
|
||||||
} }
|
} } }
|
||||||
} }
|
} }
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -105,7 +105,7 @@ for (int i = 0; i < osxPlatforms.size(); i++) {
|
|||||||
def error = null
|
def error = null
|
||||||
try {
|
try {
|
||||||
parallel platforms
|
parallel platforms
|
||||||
if (keepInstall) { node("docker") {
|
if (keepInstall) { node('linux && docker && triqs') {
|
||||||
/* Publish results */
|
/* Publish results */
|
||||||
stage("publish") { timeout(time: 5, unit: 'MINUTES') {
|
stage("publish") { timeout(time: 5, unit: 'MINUTES') {
|
||||||
def commit = sh(returnStdout: true, script: "git rev-parse HEAD").trim()
|
def commit = sh(returnStdout: true, script: "git rev-parse HEAD").trim()
|
||||||
|
Loading…
Reference in New Issue
Block a user