From 7e00bc1b57439eed5bc495230eea3d0b84a9e384 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 16 Mar 2019 20:56:55 +0100 Subject: [PATCH] Start fixing build scripts --- buildProject.php | 2 +- buildProject.sh | 2 +- config.sh | 5 +---- setup.sh | 2 -- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/buildProject.php b/buildProject.php index 39273c0..97029f4 100644 --- a/buildProject.php +++ b/buildProject.php @@ -3,7 +3,7 @@ $postBody = $_POST['payload'] ?? ''; $payload = \json_decode($postBody, true); -if (isset($payload['repository'], $payload['repository']['name']) && $payload['repository']['name'] === 'Orange-Management') { +if (isset($payload['organization'], $payload['organization']['login']) && $payload['organization']['login'] === 'Orange-Management') { shell_exec('./buildProject.sh > /dev/null 2>/dev/null &'); echo 'Installing'; diff --git a/buildProject.sh b/buildProject.sh index efd97fa..4a88c3e 100644 --- a/buildProject.sh +++ b/buildProject.sh @@ -12,4 +12,4 @@ cd ${BUILD_PATH} . ${BUILD_PATH}/Inspection/inspect.sh # Build documentation -php ${TOOLS_PATH}/documentor.phar -s ${ROOT_PATH}/phpOMS -d ${BASE_PATH}/Inspection/Test/Php/docblock -c ${INSPECTION_PATH}/Test/Php/coverage.xml -u ${INSPECTION_PATH}/Test/Php/junit_php.xml -b http://docs.orange-management.de +#php ${TOOLS_PATH}/documentor.phar -s ${ROOT_PATH}/phpOMS -d ${BASE_PATH}/Inspection/Test/Php/docblock -c ${INSPECTION_PATH}/Test/Php/coverage.xml -u ${INSPECTION_PATH}/Test/Php/junit_php.xml -b http://docs.orange-management.de diff --git a/config.sh b/config.sh index 479c38b..6598818 100644 --- a/config.sh +++ b/config.sh @@ -19,10 +19,7 @@ DB_PASSWORD="123456" # Git variables GITHUB_URL[0]="https://github.com/Orange-Management/Orange-Management.git" -GITHUB_URL[1]="https://github.com/Orange-Management/phpOMS.git" -GITHUB_URL[2]="https://github.com/Orange-Management/jsOMS.git" -GITHUB_URL[3]="https://github.com/Orange-Management/cssOMS.git" -GITHUB_URL[4]="https://github.com/Orange-Management/Website.git" +GITHUB_URL[1]="https://github.com/Orange-Management/Website.git" GIT_BRANCH="develop" diff --git a/setup.sh b/setup.sh index 872b4ef..0ec0635 100644 --- a/setup.sh +++ b/setup.sh @@ -36,7 +36,6 @@ cp ${ROOT_PATH}/Build/Hooks/default.sh ${ROOT_PATH}/.git/hooks/pre-commit cp ${ROOT_PATH}/Build/Hooks/default.sh ${ROOT_PATH}/.git/modules/Build/hooks/pre-commit cp ${ROOT_PATH}/Build/Hooks/default.sh ${ROOT_PATH}/.git/modules/phpOMS/hooks/pre-commit cp ${ROOT_PATH}/Build/Hooks/default.sh ${ROOT_PATH}/.git/modules/jsOMS/hooks/pre-commit -cp ${ROOT_PATH}/Build/Hooks/default.sh ${ROOT_PATH}/.git/modules/Model/hooks/pre-commit cp ${ROOT_PATH}/Build/Hooks/default.sh ${ROOT_PATH}/.git/modules/Modules/hooks/pre-commit cp ${ROOT_PATH}/Build/Hooks/default.sh ${ROOT_PATH}/.git/modules/cssOMS/hooks/pre-commit @@ -44,7 +43,6 @@ chmod +x ${ROOT_PATH}/.git/hooks/pre-commit chmod +x ${ROOT_PATH}/.git/modules/Build/hooks/pre-commit chmod +x ${ROOT_PATH}/.git/modules/phpOMS/hooks/pre-commit chmod +x ${ROOT_PATH}/.git/modules/jsOMS/hooks/pre-commit -chmod +x ${ROOT_PATH}/.git/modules/Model/hooks/pre-commit chmod +x ${ROOT_PATH}/.git/modules/Modules/hooks/pre-commit chmod +x ${ROOT_PATH}/.git/modules/cssOMS/hooks/pre-commit