You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bm...@apache.org on 2021/01/24 17:55:54 UTC

[shiro] branch master updated: (build) do not try to deploy on PRs.

This is an automated email from the ASF dual-hosted git repository.

bmarwell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shiro.git


The following commit(s) were added to refs/heads/master by this push:
     new eafbfa6  (build) do not try to deploy on PRs.
     new 555fe06  Merge pull request #283 from bmarwell/jenkins_pr
eafbfa6 is described below

commit eafbfa6c299e12b50709146ec9c3ff16f020966a
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Sun Jan 24 10:05:17 2021 +0100

    (build) do not try to deploy on PRs.
---
 .jenkins.groovy | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.jenkins.groovy b/.jenkins.groovy
index 9fada83..3550287 100644
--- a/.jenkins.groovy
+++ b/.jenkins.groovy
@@ -103,9 +103,11 @@ pipeline {
 
                     stage('Deploy') {
                         when {
-                            expression {
-                                env.BRANCH_NAME ==~ /(1.6.x|1.7.x|master|main)/
-                                MATRIX_JDK == 'jdk_11_latest'
+                            allOf {
+                                expression { env.BRANCH_NAME ==~ /(1.6.x|1.7.x|master|main)/ }
+                                expression { MATRIX_JDK == 'jdk_11_latest' }
+                                // is not a PR (GitHub) / MergeRequest (GitLab) / Change (Gerrit)?
+                                not { changeRequest() }
                             }
                         }
                         steps {