zipkin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From abe...@apache.org
Subject [incubator-zipkin-website] branch master updated: [Jenkinsfile] Still still trying to fix Publish step
Date Mon, 22 Apr 2019 07:46:10 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new a1ed0bb  [Jenkinsfile] Still still trying to fix Publish step
a1ed0bb is described below

commit a1ed0bbe04dce139eea9d6863cdd71d53f6c1210
Author: Zoltan Nagy <abesto0@gmail.com>
AuthorDate: Mon Apr 22 08:45:55 2019 +0100

    [Jenkinsfile] Still still trying to fix Publish step
---
 Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d0722f9..a43d0e0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -95,7 +95,7 @@ pipeline {
 
 				git fetch origin asf-site:asf-site
 				git reset --hard
-				git checkout -b asf-site --track origin/asf-site
+				git checkout asf-site
 				git log -3
 				git status
 
@@ -109,7 +109,6 @@ pipeline {
 					echo 'No changes to commit/push'
 				else
 					git commit -m "$commitmsg"
-					git pull --rebase
 					git log asf-site -3
 					git push origin asf-site
 				fi


Mime
View raw message