From 156473cba4cc82725f31b61f9e6fb0808f2eb33c Mon Sep 17 00:00:00 2001 From: Ivan Fedorov Date: Tue, 11 May 2021 21:00:51 +0300 Subject: [PATCH] run composer from docker instead of local --- .github/workflows/main.yml | 8 ++++---- CONTRIBUTING.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3f8fb030..0942984f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,12 +9,12 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Composer Install - run: composer install --ignore-platform-reqs - - name: Build Docker Container run: docker-compose -f docker-compose.yml build >/dev/null + - name: Composer Install + run: docker-compose -f docker-compose.yml run php composer install --ignore-platform-reqs -d /opt/project/phpstorm-stubs + - name: Run Tests run: docker-compose -f docker-compose.yml run php /opt/project/phpstorm-stubs/vendor/bin/phpunit /opt/project/phpstorm-stubs/tests/ @@ -22,4 +22,4 @@ jobs: run: ./tests/check-stub-map - name: run cs fixer - run: composer cs + run: docker-compose -f docker-compose.yml run php composer cs -d /opt/project/phpstorm-stubs diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9de03b55..b45a71f9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -9,7 +9,7 @@ Please check our [issue tracker] for issues corresponding to the problem you're * Please avoid any unnecessary changes e.g., spacing, line endings, HTML formatting. Remember, these files are NOT for human consumption. We want to preserve meaningful history. * Please try to match existing style for any particular file - formatting, spacing, naming conventions. * Please add corresponding @since tags -* Please run `composer cs` to check the code style and `composer cs-fix` to fix it +* Please run `docker-compose -f docker-compose.yml run php composer cs -d /opt/project/phpstorm-stubs` to check the code style and `docker-compose -f docker-compose.yml run php composer cs-fix -d /opt/project/phpstorm-stubs` to fix it ## Tests * Please make sure that tests pass for your Pull Request.