Properly pass the branch to get-server-sources.sh

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
This commit is contained in:
John Molakvoæ (skjnldsv)
2018-12-07 15:14:16 +01:00
parent d5a1678967
commit e9b56bcb89
2 changed files with 9 additions and 5 deletions

View File

@@ -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/

View File

@@ -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