From e9b56bcb8936666c2db5f0bad7974e51a035c5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 7 Dec 2018 15:14:16 +0100 Subject: [PATCH] Properly pass the branch to get-server-sources.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- Makefile | 10 +++++----- build/get-server-sources.sh | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index b059de8c7..ef026280e 100644 --- a/Makefile +++ b/Makefile @@ -36,13 +36,13 @@ user-manual-de-pdf: @echo "User manual de build finished; PDF is updated" api-docs: clean-api-docs - cd build && sh get-server-sources.sh master + cd build && sh get-server-sources.sh $(DRONE_BRANCH) mkdir -p developer_manual/api/ cd build && composer install && composer update cd build && php generateApiDoc.php -icons-docs: clean-api-docs - cd build && sh get-server-sources.sh master +icons-docs: clean-icons-docs + cd build && sh get-server-sources.sh $(DRONE_BRANCH) cd build && composer install && composer update cd build && php generateIconsDoc.php @@ -50,7 +50,7 @@ clean: clean-api-docs clean-icons-docs rm -r admin_manual/_build developer_manual/_build user_manual/_build user_manual_de_/_build clean-api-docs: - -rm -r developer_manual/api/ + rm -rf developer_manual/api/ clean-icons-docs: - -rm -r developer_manual/design/img/ + rm -rf developer_manual/design/img/ diff --git a/build/get-server-sources.sh b/build/get-server-sources.sh index b42f8697d..9cec52c33 100755 --- a/build/get-server-sources.sh +++ b/build/get-server-sources.sh @@ -6,6 +6,10 @@ NC_BRANCH="${1:-master}" +printf "\n\n" +echo Fetching source for $NC_BRANCH +printf "\n" + if [ -d server/.git ]; then cd server && git fetch && git checkout $NC_BRANCH && git reset --hard origin/$NC_BRANCH else