Skip to content
Permalink
Browse files

Use system composer

  • Loading branch information...
apeschar committed Jan 8, 2019
1 parent 17b5f78 commit 243244bbc927d784d47b01f6828126f15de3f5b1
Showing with 4 additions and 12 deletions.
  1. +3 −9 Makefile
  2. +1 −3 bin/package
@@ -15,7 +15,7 @@ test-local : all
vendor/bin/phpunit

update : all
vendor/composer.phar update
composer update

dist : all
bin/package
@@ -24,14 +24,8 @@ clean :
rm -f docker/*.image


vendor/autoload.php : vendor/composer.phar composer.json composer.lock
vendor/composer.phar install

vendor/composer.phar :
mkdir -p vendor
wget -O $@~ https://github.com/composer/composer/releases/download/1.6.3/composer.phar
chmod +x $@~
mv $@~ $@
vendor/autoload.php : composer.json composer.lock
composer install

docker/%.image : docker/% docker/entrypoint
docker build -q -f $< docker > $@~
@@ -3,8 +3,6 @@
set -euo pipefail
cd "$(dirname "$0")"/..

composer="$PWD/vendor/composer.phar"

release="$(git tag -l --points-at=HEAD | grep -P '^[0-9]\.' || :)"
if [[ $release = "" ]]; then
release=HEAD
@@ -19,7 +17,7 @@ git archive HEAD composer.{json,lock} src certificates | tar xf - -C "$tmp"

(
cd "$tmp"
$composer install -o --no-dev
composer install -o --no-dev
rm -f composer.{json,lock}
find -not -name . -not -name .. -name '.*' -exec rm -r {} +
tar cJf - --xform 's/^\./phast/' .

0 comments on commit 243244b

Please sign in to comment.
You can’t perform that action at this time.