You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hop.apache.org by ha...@apache.org on 2020/11/08 13:29:36 UTC

[incubator-hop] branch master updated: Move all steps to one stage

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

hansva pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git


The following commit(s) were added to refs/heads/master by this push:
     new 6d9d653  Move all steps to one stage
6d9d653 is described below

commit 6d9d6533aca95e3885ee099bbe9821800e99877b
Author: Hans Van Akelyen <ha...@gmail.com>
AuthorDate: Sun Nov 8 14:29:25 2020 +0100

    Move all steps to one stage
---
 Jenkinsfile | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 4f953ff..010ee99 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -77,7 +77,7 @@ pipeline {
                     sh "find ./ -name '*.adoc' -exec cp -prv --parents '{}' './tmp/' ';'"
             }
         }
-        stage('Checkout Docs') {
+        stage('Process Docs') {
             when {
                 branch 'master'
             }
@@ -85,16 +85,8 @@ pipeline {
                 dir('hop-doc') {
                     deleteDir()
                     sh 'git clone -b master https://gitbox.apache.org/repos/asf/incubator-hop-docs.git .'
-                }
-            }
-        }
-        stage('Copy docs') {
-            when {
-                branch 'master'
-            }
-            steps {
                     sh '''
-                        cd tmp;
+                        cd ../tmp;
                         for f in $(find ./ -name '*.adoc')
                         do
                         echo "Processing $f"
@@ -104,18 +96,12 @@ pipeline {
                             mkdir -p ../hop-doc/hop-user-manual/modules/ROOT/pages$FILEPATH && cp $f ../hop-doc/hop-user-manual/modules/ROOT/pages$FILEPATH;
                         fi
                         done
+                        cd ../hop-doc
                     '''
-            }
-        }
-        stage('Push Documentation') {
-            when {
-                branch 'master'
-            }
-            steps {
-                dir('hop-doc') {
                     sh 'git add .'
                     sh 'git commit -m "Documentation updated to $GIT_COMMIT"'
                     sh 'git push --force origin master'
+
                 }
             }
         }