You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2020/10/17 21:39:09 UTC
[shiro] 02/02: Update Jenkinsfiles with 1.7 branch
This is an automated email from the ASF dual-hosted git repository.
bdemers pushed a commit to branch 1.7.x
in repository https://gitbox.apache.org/repos/asf/shiro.git
commit 0b370f5b327936a0c7922275c37341ed82f03642
Author: Brian Demers <bd...@apache.org>
AuthorDate: Sat Oct 17 17:38:51 2020 -0400
Update Jenkinsfiles with 1.7 branch
---
Jenkinsfile | 10 +++++-----
Jenkinsfile-jdk11 | 8 ++++----
Jenkinsfile-jdk14 | 8 ++++----
3 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c433988..e92a867 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -92,7 +92,7 @@ pipeline {
stage('Generate doc') {
when {
expression {
- env.BRANCH_NAME ==~ /(1.5.x|1.6.x|master)/
+ env.BRANCH_NAME ==~ /(1.6.x|1.7.x|master)/
}
}
steps {
@@ -104,7 +104,7 @@ pipeline {
stage('Deploy') {
when {
expression {
- env.BRANCH_NAME ==~ /(1.5.x|1.6.x|master)/
+ env.BRANCH_NAME ==~ /(1.6.x|1.7.x|master)/
}
}
steps {
@@ -119,7 +119,7 @@ pipeline {
// If this build failed, send an email to the list.
failure {
script {
- if(env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "master") {
+ if(env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "1.7.x" || env.BRANCH_NAME == "master") {
emailext(
subject: "[BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
@@ -136,7 +136,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC
// If this build didn't fail, but there were failing tests, send an email to the list.
unstable {
script {
- if(env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "master") {
+ if(env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "1.7.x" || env.BRANCH_NAME == "master") {
emailext(
subject: "[BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
@@ -156,7 +156,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC
// (in this cae we probably don't have to do any post-build analysis)
deleteDir()
script {
- if ((env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "master") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) {
+ if ((env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "1.7.x" || env.BRANCH_NAME == "master") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) {
emailext (
subject: "[BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
diff --git a/Jenkinsfile-jdk11 b/Jenkinsfile-jdk11
index 73e50f0..95af902 100644
--- a/Jenkinsfile-jdk11
+++ b/Jenkinsfile-jdk11
@@ -92,7 +92,7 @@ pipeline {
stage('Generate doc') {
when {
expression {
- env.BRANCH_NAME ==~ /(1.5.x|1.6.x|master)/
+ env.BRANCH_NAME ==~ /(1.6.x|1.7.x|master)/
}
}
steps {
@@ -107,7 +107,7 @@ pipeline {
// If this build failed, send an email to the list.
failure {
script {
- if(env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "master") {
+ if(env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "1.7.x" || env.BRANCH_NAME == "master") {
emailext(
subject: "[BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
@@ -124,7 +124,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC
// If this build didn't fail, but there were failing tests, send an email to the list.
unstable {
script {
- if(env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "master") {
+ if(env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "1.7.x" || env.BRANCH_NAME == "master") {
emailext(
subject: "[BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
@@ -144,7 +144,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC
// (in this cae we probably don't have to do any post-build analysis)
deleteDir()
script {
- if ((env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "master") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) {
+ if ((env.BRANCH_NAME == "1.7.x" || env.BRANCH_NAME == "1.7.x" || env.BRANCH_NAME == "master") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) {
emailext (
subject: "[BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
diff --git a/Jenkinsfile-jdk14 b/Jenkinsfile-jdk14
index 7fcda4d..74f8094 100644
--- a/Jenkinsfile-jdk14
+++ b/Jenkinsfile-jdk14
@@ -92,7 +92,7 @@ pipeline {
stage('Generate doc') {
when {
expression {
- env.BRANCH_NAME ==~ /(1.5.x|1.6.x|master)/
+ env.BRANCH_NAME ==~ /(1.6.x|1.7.x|master)/
}
}
steps {
@@ -107,7 +107,7 @@ pipeline {
// If this build failed, send an email to the list.
failure {
script {
- if(env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "master") {
+ if(env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "1.7.x" || env.BRANCH_NAME == "master") {
emailext(
subject: "[BUILD-FAILURE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
@@ -124,7 +124,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC
// If this build didn't fail, but there were failing tests, send an email to the list.
unstable {
script {
- if(env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "master") {
+ if(env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "1.7.x" || env.BRANCH_NAME == "master") {
emailext(
subject: "[BUILD-UNSTABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """
@@ -144,7 +144,7 @@ Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME} [${env.BRANC
// (in this cae we probably don't have to do any post-build analysis)
deleteDir()
script {
- if ((env.BRANCH_NAME == "1.5.x" || env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "master") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) {
+ if ((env.BRANCH_NAME == "1.6.x" || env.BRANCH_NAME == "1.7.x" || env.BRANCH_NAME == "master") && (currentBuild.previousBuild != null) && (currentBuild.previousBuild.result != 'SUCCESS')) {
emailext (
subject: "[BUILD-STABLE]: Job '${env.JOB_NAME} [${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]'",
body: """