Skip to content

Commit 88eaedb

Browse files
committed
Merge remote-tracking branch 'app4triqs-remote/unstable' into unstable
2 parents f60972a + 312f9d1 commit 88eaedb

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
@@ -6,7 +6,7 @@ def documentationPlatform = "ubuntu-clang"
66
All others use the default (OFF) from c2py. */
77
def regenPlatforms = ["ubuntu-clang"]
88
/* depend on triqs upstream branch/project */
9-
def triqsBranch = env.BRANCH_NAME == "jenkins" ? "jenkins" : "unstable"
9+
def triqsBranch = env.CHANGE_TARGET ?: env.BRANCH_NAME
1010
def triqsProject = '/CCQ/TRIQS/triqs/' + triqsBranch.replaceAll('/', '%2F')
1111
/* whether to keep and publish the results */
1212
def keepInstall = !env.BRANCH_NAME.startsWith("PR-")
@@ -146,7 +146,7 @@ for (int i = 0; i < macosPlatforms.size(); i++) {
146146
catchError {
147147
parallel platforms
148148

149-
if (false && keepInstall) {
149+
if (keepInstall) {
150150
/* Publish results */
151151
stage("publish") {
152152
timeout(time: 10, unit: 'MINUTES') {
@@ -159,8 +159,9 @@ catchError {
159159
dir("$WORKSPACE_TMP/gh-pages") {
160160
def subdir = "$projectName/${env.BRANCH_NAME}"
161161
def ghp = scmGit(branches: [[name: 'refs/heads/master']],
162+
extensions: [cloneOption(shallow: true, depth: 1, noTags: true)],
162163
userRemoteConfigs: [[credentialsId: 'github-jenkins', url: 'https://github.com/TRIQS/TRIQS.github.io.git']])
163-
checkout scm: ghp, changelog: false
164+
checkout scm: ghp, changelog: false, poll: false
164165
sh "rm -rf ${subdir}"
165166
def installDir = "$installBase/install/$JOB_NAME/$documentationPlatform"
166167
sh """#!/bin/bash -ex
@@ -179,7 +180,7 @@ catchError {
179180
try {
180181
def pkg = scmGit(branches: [[name: "refs/heads/${env.BRANCH_NAME}"]],
181182
userRemoteConfigs: [[credentialsId: 'github-jenkins', url: 'https://github.com/TRIQS/packaging.git']])
182-
checkout scm: pkg, changelog: false
183+
checkout scm: pkg, changelog: false, poll: false
183184
sh """#!/bin/bash -ex
184185
dir="$projectName"
185186
[[ -d triqs_\$dir ]] && dir=triqs_\$dir || [[ -d \$dir ]]

0 commit comments

Comments
 (0)