Skip to content

Commit 06b8197

Browse files
committed
Merge remote-tracking branch 'app4triqs-remote/unstable' into unstable
2 parents 42ae550 + 312f9d1 commit 06b8197

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

jenkins/Jenkinsfile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ def projectName = "solid_dmft" /* set to app/repo name */
33
/* which platform to build documentation on */
44
def documentationPlatform = "ubuntu-clang"
55
/* depend on triqs upstream branch/project */
6-
def triqsBranch = env.BRANCH_NAME == "jenkins" ? "jenkins" : "unstable"
6+
def triqsBranch = env.CHANGE_TARGET ?: env.BRANCH_NAME
77
def triqsProject = '/CCQ/TRIQS/triqs/' + triqsBranch.replaceAll('/', '%2F')
88
/* Upstream TRIQS apps that solid_dmft imports at runtime. As a python-only app
99
we only need them importable, so rather than rebuilding them from source we
@@ -152,7 +152,7 @@ for (int i = 0; i < macosPlatforms.size(); i++) {
152152
catchError {
153153
parallel platforms
154154

155-
if (false && keepInstall) {
155+
if (keepInstall) {
156156
/* Publish results */
157157
stage("publish") {
158158
timeout(time: 10, unit: 'MINUTES') {
@@ -165,8 +165,9 @@ catchError {
165165
dir("$WORKSPACE_TMP/gh-pages") {
166166
def subdir = "$projectName/${env.BRANCH_NAME}"
167167
def ghp = scmGit(branches: [[name: 'refs/heads/master']],
168+
extensions: [cloneOption(shallow: true, depth: 1, noTags: true)],
168169
userRemoteConfigs: [[credentialsId: 'github-jenkins', url: 'https://github.com/TRIQS/TRIQS.github.io.git']])
169-
checkout scm: ghp, changelog: false
170+
checkout scm: ghp, changelog: false, poll: false
170171
sh "rm -rf ${subdir}"
171172
def installDir = "$installBase/install/$JOB_NAME/$documentationPlatform"
172173
sh """#!/bin/bash -ex
@@ -185,7 +186,7 @@ catchError {
185186
try {
186187
def pkg = scmGit(branches: [[name: "refs/heads/${env.BRANCH_NAME}"]],
187188
userRemoteConfigs: [[credentialsId: 'github-jenkins', url: 'https://github.com/TRIQS/packaging.git']])
188-
checkout scm: pkg, changelog: false
189+
checkout scm: pkg, changelog: false, poll: false
189190
sh """#!/bin/bash -ex
190191
dir="$projectName"
191192
[[ -d triqs_\$dir ]] && dir=triqs_\$dir || [[ -d \$dir ]]

0 commit comments

Comments
 (0)