From: Florian Zschocke <f.zschocke+git@gmail.com>
Date: Thu, 6 Apr 2023 18:19:04 +0000 (+0200)
Subject: build: Keep CNAME file when updating gh-pages branch
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e45fe069441d0cde5391e381500aab93a7fa11ac;p=gitblit.git

build: Keep CNAME file when updating gh-pages branch

The CNAME file on the gh-pages branch is used to link the gh-pages
to the gitblit.com domain. So it needs to stay around when updating
the gh-pages branch with new documentation pages.
This is possible since Moxie 0.10.0 with a new `keep` sub-element.
---

diff --git a/build.xml b/build.xml
index d6c3b01f..193aeb6b 100644
--- a/build.xml
+++ b/build.xml
@@ -722,9 +722,13 @@
 		Update the gh-pages branch with the current site
 		~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	-->
-	<target name="updateGhPages">
+	<target name="updateGhPages" depends="prepare">
 		<!-- Build gh-pages branch -->
-		<mx:ghpages repositorydir="${basedir}" obliterate="true" />
+		<mx:ghpages repositorydir="${basedir}" obliterate="true">
+			<keep>
+				<file name="CNAME"/>
+			</keep>
+		</mx:ghpages>
 	</target>