You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2018/11/14 12:53:10 UTC
[incubator-plc4x] branch develop created (now 4efd370)
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git.
at 4efd370 - Created the develop branch and adjusted the Jenkinsfile to now do it's SNAPSHOT magic on the develop branch instead of master.
This branch includes the following new commits:
new 4efd370 - Created the develop branch and adjusted the Jenkinsfile to now do it's SNAPSHOT magic on the develop branch instead of master.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[incubator-plc4x] 01/01: - Created the develop branch and adjusted
the Jenkinsfile to now do it's SNAPSHOT magic on the develop branch instead
of master.
Posted by cd...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit 4efd370826cfea9e081f214eea845c2f0c492c13
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Wed Nov 14 13:53:05 2018 +0100
- Created the develop branch and adjusted the Jenkinsfile to now do it's SNAPSHOT magic on the develop branch instead of master.
---
Jenkinsfile | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 7fe71db..fcfb0ed 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,7 +33,7 @@ pipeline {
PLC4X_BUILD_ON_JENKINS = true
JENKINS_PROFILE = 'jenkins-build'
- // On non master build we don't want to pollute the global m2 repo
+ // On non develop build we don't want to pollute the global m2 repo
MVN_LOCAL_REPO_OPT = '-Dmaven.repo.local=.repository'
// Testfails will be handled by the jenkins junit steps and mark the build as unstable.
MVN_TEST_FAIL_IGNORE = '-Dmaven.test.failure.ignore=true'
@@ -77,7 +77,7 @@ pipeline {
stage('Build') {
when {
expression {
- env.BRANCH_NAME != 'master'
+ env.BRANCH_NAME != 'develop'
}
}
steps {
@@ -92,9 +92,9 @@ pipeline {
}
}
- stage('Build master') {
+ stage('Build develop') {
when {
- branch 'master'
+ branch 'develop'
}
steps {
echo 'Building'
@@ -119,7 +119,7 @@ pipeline {
// Disabled till auth issues are resolved on infra.
stage('Code Quality') {
when {
- branch 'master'
+ branch 'develop'
}
// Only the official build nodes have the credentials to deploy setup.
/*agent {
@@ -137,7 +137,7 @@ pipeline {
stage('Deploy') {
when {
- branch 'master'
+ branch 'develop'
}
// Only the official build nodes have the credentials to deploy setup.
agent {
@@ -157,7 +157,7 @@ pipeline {
stage('Build site') {
when {
- branch 'master'
+ branch 'develop'
}
steps {
echo 'Building Site'
@@ -167,7 +167,7 @@ pipeline {
stage('Stage site') {
when {
- branch 'master'
+ branch 'develop'
}
steps {
echo 'Staging Site'
@@ -179,7 +179,7 @@ pipeline {
stage('Deploy site') {
when {
- branch 'master'
+ branch 'develop'
}
// Only the nodes labeled 'git-websites' have the credentials to commit to the.
agent {