You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2017/06/20 21:52:09 UTC
[1/2] jspwiki-site git commit: do not delete apidocs
Repository: jspwiki-site
Updated Branches:
refs/heads/jbake d2448759a -> f777118e0
do not delete apidocs
Project: http://git-wip-us.apache.org/repos/asf/jspwiki-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki-site/commit/3f114723
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki-site/tree/3f114723
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki-site/diff/3f114723
Branch: refs/heads/jbake
Commit: 3f1147234733b29a51a204e7d9259f0d78ece1f7
Parents: d244875
Author: Juan Pablo Santos Rodriguez <ju...@apache.org>
Authored: Tue Jun 20 21:35:33 2017 +0200
Committer: Juan Pablo Santos Rodriguez <ju...@apache.org>
Committed: Tue Jun 20 21:35:33 2017 +0200
----------------------------------------------------------------------
ci.sh | 2 +-
mvn-ci.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/3f114723/ci.sh
----------------------------------------------------------------------
diff --git a/ci.sh b/ci.sh
index 2799a72..8bd4778 100755
--- a/ci.sh
+++ b/ci.sh
@@ -4,7 +4,7 @@ java -Djavax.xml.accessExternalDTD=http -jar "${JBAKE_HOME}/jbake-core.jar" src/
git checkout asf-site
git clean -f -d
git pull origin asf-site
-find . -type d | grep -v target | grep -v .git | xargs rm -rf
+find . -type d | grep -v target | grep -v .git | grep -v apidocs | xargs rm -rf
mv target/content/* ./
rm -rf target
git add .
http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/3f114723/mvn-ci.sh
----------------------------------------------------------------------
diff --git a/mvn-ci.sh b/mvn-ci.sh
index 2841870..871f205 100755
--- a/mvn-ci.sh
+++ b/mvn-ci.sh
@@ -4,7 +4,7 @@ mvn clean generate-resources
git checkout asf-site
git clean -f -d
git pull origin asf-site
-find . -type d | grep -v target | grep -v .git | xargs rm -rf
+find . -type d | grep -v target | grep -v .git | grep -v apidocs | xargs rm -rf
mv target/content/* ./
rm -rf target
git add .
[2/2] jspwiki-site git commit: mv doesn't overwrite existing files,
switching to cp -rf
Posted by ju...@apache.org.
mv doesn't overwrite existing files, switching to cp -rf
Project: http://git-wip-us.apache.org/repos/asf/jspwiki-site/repo
Commit: http://git-wip-us.apache.org/repos/asf/jspwiki-site/commit/f777118e
Tree: http://git-wip-us.apache.org/repos/asf/jspwiki-site/tree/f777118e
Diff: http://git-wip-us.apache.org/repos/asf/jspwiki-site/diff/f777118e
Branch: refs/heads/jbake
Commit: f777118e00f8a9329b4a83f194d40327dd611502
Parents: 3f11472
Author: Juan Pablo Santos Rodriguez <ju...@apache.org>
Authored: Tue Jun 20 23:46:54 2017 +0200
Committer: Juan Pablo Santos Rodriguez <ju...@apache.org>
Committed: Tue Jun 20 23:46:54 2017 +0200
----------------------------------------------------------------------
ci.sh | 2 +-
mvn-ci.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/f777118e/ci.sh
----------------------------------------------------------------------
diff --git a/ci.sh b/ci.sh
index 8bd4778..7ecad39 100755
--- a/ci.sh
+++ b/ci.sh
@@ -5,7 +5,7 @@ git checkout asf-site
git clean -f -d
git pull origin asf-site
find . -type d | grep -v target | grep -v .git | grep -v apidocs | xargs rm -rf
-mv target/content/* ./
+cp -rf target/content/* ./
rm -rf target
git add .
git commit -m "Automatic Site Publish by Buildbot"
http://git-wip-us.apache.org/repos/asf/jspwiki-site/blob/f777118e/mvn-ci.sh
----------------------------------------------------------------------
diff --git a/mvn-ci.sh b/mvn-ci.sh
index 871f205..53dad29 100755
--- a/mvn-ci.sh
+++ b/mvn-ci.sh
@@ -5,7 +5,7 @@ git checkout asf-site
git clean -f -d
git pull origin asf-site
find . -type d | grep -v target | grep -v .git | grep -v apidocs | xargs rm -rf
-mv target/content/* ./
+cp -rf target/content/* ./
rm -rf target
git add .
git commit -m "Site + Apidocs Maven Publish"