From e9fb7f1e5157ff5e1b3125644c89fb9e4c59f42f Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Aug 06 2018 14:32:16 +0000 Subject: Fix doc publication. We can use GIT_BRANCH now that @jmolet updated our jenkins plugins. --- diff --git a/Jenkinsfile b/Jenkinsfile index 903c9d2..86f3ac6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,9 +28,7 @@ node('fedora-27') { sh 'DEV=true GREENWAVE_CONFIG=$(pwd)/conf/settings.py.example make -C docs html' archiveArtifacts artifacts: 'docs/_build/html/**' } - /* Can't use GIT_BRANCH because of this issue https://issues.jenkins-ci.org/browse/JENKINS-35230 */ - def git_branch = sh(returnStdout: true, script: 'git rev-parse --abbrev-ref HEAD').trim() - if (git_branch == 'master') { + if (scmVars.GIT_BRANCH == 'origin/master') { stage('Publish Docs') { sshagent (credentials: ['pagure-greenwave-deploy-key']) { sh '''