[incubator-openwhisk-website] branch master updated: use git pull to sync branch asf-site before push (#247)

[du...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 5921157  use git pull to sync branch asf-site before push (#247)
5921157 is described below

commit 5921157a928c2f00a36270238645f98cff44a3db
Author: Carlos Santana <cs...@gmail.com>
AuthorDate: Mon Sep 25 12:39:12 2017 -0400

    use git pull to sync branch asf-site before push (#247)
---
 tools/jenkins/website_build.groovy | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tools/jenkins/website_build.groovy b/tools/jenkins/website_build.groovy
index ab85428..c58beed 100644
--- a/tools/jenkins/website_build.groovy
+++ b/tools/jenkins/website_build.groovy
@@ -28,6 +28,7 @@ node("git-websites") {
   stage('Publish') {
     // Run git commands to push
     sh '''
+    alias
     pwd
     ls
     echo "Pushing openwhisk site to asf"
@@ -49,7 +50,10 @@ node("git-websites") {
     git diff
     git add .
     git status
+    git log asf-site -3
     git commit -m "Automatic Site Publish by Jenkins"
+    git pull --rebase
+    git log asf-site -3
     git push origin asf-site
     '''
   }

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].