From 13882c5d70171124a5e8f0759421d41aae3658e0 Mon Sep 17 00:00:00 2001 From: Yuta Nagamiya Date: Sat, 10 Apr 2021 23:53:57 +0900 Subject: [PATCH 1/2] Extract tools For code completion when writing test code. --- .github/workflows/php.yml | 2 ++ .gitignore | 1 + .laradock/commands/my/up.sh | 3 ++- .phive/phars.xml | 1 + composer.json | 4 ++++ 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index d4cdbb6..05d108c 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -15,6 +15,8 @@ jobs: - name: Install tools uses: ngmy/phive-install-action@master + with: + phive-arguments: --force-accept-unsigned - name: Upload tools to artifact store uses: actions/upload-artifact@master diff --git a/.gitignore b/.gitignore index b476d16..e5e1024 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ /.phpdoc /build/ /tools/ +/tools-src/ /vendor .envrc.local .php_cs diff --git a/.laradock/commands/my/up.sh b/.laradock/commands/my/up.sh index 3714387..e91e585 100644 --- a/.laradock/commands/my/up.sh +++ b/.laradock/commands/my/up.sh @@ -17,5 +17,6 @@ handle() { docker-compose exec workspace chmod +x /tmp/phive.phar docker-compose exec workspace mv /tmp/phive.phar /usr/local/bin/phive fi - docker-compose exec -u laradock workspace bash -c 'yes | phive --home .laradock/data/phive install' + docker-compose exec -u laradock workspace bash -c 'yes | phive --home .laradock/data/phive install --force-accept-unsigned' + docker-compose exec -u laradock workspace composer phar-extractor } diff --git a/.phive/phars.xml b/.phive/phars.xml index bc44d25..43f6ef8 100644 --- a/.phive/phars.xml +++ b/.phive/phars.xml @@ -1,5 +1,6 @@ + diff --git a/composer.json b/composer.json index 3fa943f..f699967 100644 --- a/composer.json +++ b/composer.json @@ -53,6 +53,10 @@ "doc": [ "@phpdoc" ], + "phar-extractor": [ + "rm -rf tools-src", + "tools/phar-extractor extract-phive-xml -t tools-src" + ], "php-cs-fixer": [ "tools/php-cs-fixer fix --ansi" ], From 7e9ed09b852d590dd46f925b601f7032f7443242 Mon Sep 17 00:00:00 2001 From: Yuta Nagamiya Date: Thu, 22 Apr 2021 22:49:12 +0900 Subject: [PATCH 2/2] Update tools --- .phive/phars.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.phive/phars.xml b/.phive/phars.xml index 43f6ef8..0793476 100644 --- a/.phive/phars.xml +++ b/.phive/phars.xml @@ -2,11 +2,11 @@ - - - + + + - +