Branch: refs/heads/master
Home: https://github.com/jenkinsci/pipeline-model-definition-plugin
Commit: 7fb4f69e3cf4fb9bfcd5addd10f96febd1d0e4fc
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/7fb4f69e3cf4fb9bfcd5addd10f96febd1d0e4fc
Author: Andrew Bayer <andrew.ba...@gmail.com>
Date: 2018-04-17 (Tue, 17 Apr 2018)
Changed paths:
M
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/BranchConditionalScript.groovy
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BasicModelDefTest.java
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WhenStageTest.java
A
pipeline-model-definition/src/test/resources/whenBranchNotMultibranch.groovy
M pom.xml
Log Message:
-----------
[FIXED JENKINS-50815] Fallback to GIT_LOCAL_BRANCH for when branch
If we're not on multibranch (meaning BRANCH_NAME is null), fallback to
GIT_LOCAL_BRANCH for when branch condition. We can theoretically add
other SCMs here too if needed. We're using GIT_LOCAL_BRANCH because it
most closely matches BRANCH_NAME - i.e., GIT_BRANCH includes the
remote, GIT_LOCAL_BRANCH does not.
Commit: 70d018e24042a14814f09b56ea3f4aa918deef80
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/70d018e24042a14814f09b56ea3f4aa918deef80
Author: Andrew Bayer <andrew.ba...@gmail.com>
Date: 2018-04-17 (Tue, 17 Apr 2018)
Changed paths:
M
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/BranchConditionalScript.groovy
M
pipeline-model-definition/src/test/resources/whenBranchNotMultibranch.groovy
Log Message:
-----------
Check against empty string for BRANCH_NAME as well, and override
BRANCH_NAME in test.
Commit: 7bc34d30ebefd42113c76a26db86cca717914fa7
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/7bc34d30ebefd42113c76a26db86cca717914fa7
Author: Andrew Bayer <andrew.ba...@gmail.com>
Date: 2018-04-18 (Wed, 18 Apr 2018)
Changed paths:
M
pipeline-model-definition/src/test/resources/whenBranchNotMultibranch.groovy
Log Message:
-----------
Duh, got the syntax wrong
Commit: 3c8247fd5a5deeb15e9120b410dbd346030975a5
https://github.com/jenkinsci/pipeline-model-definition-plugin/commit/3c8247fd5a5deeb15e9120b410dbd346030975a5
Author: Andrew Bayer <andrew.ba...@gmail.com>
Date: 2018-04-24 (Tue, 24 Apr 2018)
Changed paths:
M
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/when/impl/BranchConditionalScript.groovy
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/BasicModelDefTest.java
M
pipeline-model-definition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WhenStageTest.java
A
pipeline-model-definition/src/test/resources/whenBranchNotMultibranch.groovy
M pom.xml
Log Message:
-----------
Merge pull request #265 from abayer/jenkins-50815
[FIXED JENKINS-50815] Fallback to GIT_LOCAL_BRANCH for when branch
Compare:
https://github.com/jenkinsci/pipeline-model-definition-plugin/compare/59679b7d1406...3c8247fd5a5d
--
You received this message because you are subscribed to the Google Groups
"Jenkins Commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jenkinsci-commits+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
