From 39bfad6d9c1e8ab99fa49450a8fca6d9780b9fa2 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Thu, 26 Nov 2020 15:47:33 +0100 Subject: dont use system composer for autoload checker this ensures that the same composer version is used by everyone (and ci) Signed-off-by: Robin Appelman --- .gitignore | 2 ++ build/autoloaderchecker.sh | 26 +++++++++----------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 4e6967c19d1..93c45037771 100644 --- a/.gitignore +++ b/.gitignore @@ -153,3 +153,5 @@ clover.xml # Tests - dependencies tests/acceptance/composer.lock tests/acceptance/vendor/ + +composer.phar diff --git a/build/autoloaderchecker.sh b/build/autoloaderchecker.sh index ffa157f6c80..3a5ac32913a 100755 --- a/build/autoloaderchecker.sh +++ b/build/autoloaderchecker.sh @@ -1,26 +1,18 @@ #!/usr/bin/env bash -COMPOSER_COMMAND=$(which "composer") -if [ "$COMPOSER_COMMAND" = '' ] +COMPOSER_COMMAND="php composer.phar" + +if [ -e "composer.phar" ] then - #No global composer found, try local or download it - if [ -e "composer.phar" ] - then - echo "Composer found: checking for update" - else - echo "Composer not found: fetching" - php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - php composer-setup.php - php -r "unlink('composer-setup.php');" - fi - - COMPOSER_COMMAND="php composer.phar" + echo "Composer found: checking for update" + $COMPOSER_COMMAND self-update else - echo "Global composer found: checking for update" + echo "Composer not found: fetching" + php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" + php composer-setup.php + php -r "unlink('composer-setup.php');" fi -#Make sure we are on the latest composer -$COMPOSER_COMMAND self-update REPODIR=`git rev-parse --show-toplevel` -- cgit v1.2.3 From f526b4f2a61ec714b61389bb6790c4e073549299 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 2 Dec 2020 15:02:56 +0100 Subject: cleanup after autoloader generation Signed-off-by: Robin Appelman --- build/autoloaderchecker.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build/autoloaderchecker.sh b/build/autoloaderchecker.sh index 3a5ac32913a..9bf8b17a8c9 100755 --- a/build/autoloaderchecker.sh +++ b/build/autoloaderchecker.sh @@ -42,6 +42,8 @@ do fi done +rm composer.phar + echo if [ $composerfile = true ] then -- cgit v1.2.3 From dc3ff2eeadd85f50d36068158120b3efb8d51570 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Fri, 4 Dec 2020 14:27:35 +0100 Subject: Force composer v1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- build/autoloaderchecker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/autoloaderchecker.sh b/build/autoloaderchecker.sh index 9bf8b17a8c9..1aa880684f9 100755 --- a/build/autoloaderchecker.sh +++ b/build/autoloaderchecker.sh @@ -9,7 +9,7 @@ then else echo "Composer not found: fetching" php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" - php composer-setup.php + php composer-setup.php --1 php -r "unlink('composer-setup.php');" fi -- cgit v1.2.3