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/plc4x.git
The following commit(s) were added to refs/heads/develop by this push:
new dbfac0e - Updated references to "master" to "release" in
documentation and tooling
dbfac0e is described below
commit dbfac0e58d2d633e2bde57bcb7c5bb660682d716
Author: Christofer Dutz <[email protected]>
AuthorDate: Mon Jul 6 09:39:35 2020 +0200
- Updated references to "master" to "release" in documentation and tooling
---
.gitlab-ci.yml | 48 ----------------------
Jenkinsfile | 6 +--
src/site/asciidoc/developers/contributing.adoc | 6 +--
.../asciidoc/developers/release/build-tools.adoc | 6 +--
src/site/asciidoc/developers/release/release.adoc | 8 ++--
5 files changed, 13 insertions(+), 61 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 64a03f0..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-image: maven:3-jdk-8
-
-# Asciidoctor requires some tools for generating the documentation
-before_script:
- - apt-get update
- - apt-get install -y python-seqdiag python-nwdiag
-
-stages:
- - build
- - stage-site
-
-build:
- stage: build
- script:
- - mvn clean package site site:stage
- artifacts:
- paths:
- - target/staging
-
-# Have gitlab publish the content of the target/staging directory as gitlab
pages website
-# NOTE: Don't ask me why I have to rename it that way ...
-pages:
- stage: stage-site
- script:
- - mkdir public
- - mv target/staging/* public/
- artifacts:
- paths:
- - public
- only:
- - master
diff --git a/Jenkinsfile b/Jenkinsfile
index 11a8418..346edc6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -286,14 +286,14 @@ Is back to normal.
always {
script {
- if(env.BRANCH_NAME == "master") {
+ if(env.BRANCH_NAME == "release") {
// Double check if something was really changed as
sometimes the
// build just runs without any changes.
if(currentBuild.changeSets.size() > 0) {
emailext(
- subject: "[COMMIT-TO-MASTER]: A commit to the
master branch was made'",
+ subject: "[COMMIT-TO-RELEASE]: A commit to the
release branch was made'",
body: """
-COMMIT-TO-MASTER: A commit to the master branch was made:
+COMMIT-TO-RELEASE: A commit to the release branch was made:
Check console output at "<a href="${env.BUILD_URL}">${env.JOB_NAME}
[${env.BRANCH_NAME}] [${env.BUILD_NUMBER}]</a>"
""",
diff --git a/src/site/asciidoc/developers/contributing.adoc
b/src/site/asciidoc/developers/contributing.adoc
index 78a1f9d..5f5fefc 100644
--- a/src/site/asciidoc/developers/contributing.adoc
+++ b/src/site/asciidoc/developers/contributing.adoc
@@ -127,7 +127,7 @@ The PLC4X project uses the following branching model.
The same model is used for a wide variety of other projects, so it should be
pretty straight forward.
-- `master` contains the latest released state.
+- `release` contains the latest released state.
- Development is performed on the `develop` branch.
- Features are developed in Feature-Branches with a prefix `feature/`
- Each minor release has a corresponding release branch
`rel/{major-version}.{minor-version}`
@@ -149,8 +149,8 @@ digraph g{
fontcolor="deepskyblue", font="Arial bold", fontsize="14pt" ];
edge [color="#909090", penwidth=3];
- node [group="master"];
- m1 [label="master", width=0.9];
+ node [group="release"];
+ m1 [label="release", width=0.9];
m2 [label="0.2.0", width=0.9];
m3 [label="0.2.1", width=0.9];
m4 [label="", shape=circle, color="#b0b0b0"];
diff --git a/src/site/asciidoc/developers/release/build-tools.adoc
b/src/site/asciidoc/developers/release/build-tools.adoc
index 781f922..e76fd34 100644
--- a/src/site/asciidoc/developers/release/build-tools.adoc
+++ b/src/site/asciidoc/developers/release/build-tools.adoc
@@ -358,14 +358,14 @@ This will move all artifacts into the Apache release
repository and delete the s
All release artifacts released to the Apache release repo, will automatically
be synced to Maven central.
-=== Merge back release version to master branch
+=== Merge back release version to `release` branch
-The master branch should always point to the last released version.
+The `release branch should always point to the last released version.
This has to be done with git
[subs="verbatim,attributes"]
----
-git checkout master
+git checkout release
git merge release/{current-full-version}
----
diff --git a/src/site/asciidoc/developers/release/release.adoc
b/src/site/asciidoc/developers/release/release.adoc
index c868054..56eecbd 100644
--- a/src/site/asciidoc/developers/release/release.adoc
+++ b/src/site/asciidoc/developers/release/release.adoc
@@ -54,7 +54,7 @@ IMPORTANT: Please be sure to execute the release with a Java
version between 1.8
* [ ] Add the version to the DOAP file on `develop`
* [ ] Update Download site
* [ ] Update Jira
-* [ ] Merge back release version to `master` branch
+* [ ] Merge back release version to `release` branch
* [ ] Send announce email
=== Preparing your system for being able to release
@@ -477,14 +477,14 @@ Please add the just released version to the top of the
versions.
This file is needed for Apache's tooling to automatically keep track of
project release activity and we use this internally too to automatically update
the documentation to always reference the latest released version automatically.
-=== Merge back release version to master branch
+=== Merge back release version to `release` branch
-The master branch should always point to the last released version.
+The `release` branch should always point to the last released version.
This has to be done with git
[subs="verbatim,attributes"]
----
-git checkout master
+git checkout release
git merge release/{current-full-version}
----
