diff --git a/.github/workflows/build.yml b/.github/workflows/increment-build-number.yml similarity index 93% rename from .github/workflows/build.yml rename to .github/workflows/increment-build-number.yml index 407bbfcc..7379b468 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/increment-build-number.yml @@ -1,4 +1,4 @@ -name: Build +name: Increment Build Number on: pull_request: @@ -27,4 +27,4 @@ jobs: git config --global user.email 'noreply@github.com' git add src/ZM/ConsoleApplication.php git commit -m "increment build number" - git push \ No newline at end of file + git push diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 004c2471..cde0c4ad 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -1,4 +1,4 @@ -name: Integration Test +name: Integration and Style Test on: push: @@ -61,5 +61,41 @@ jobs: - name: Run Static Analysis run: "composer analyse" + - name: Run PHPUnit + run: "composer test" + + cs-check: + name: PHP CS Fixer Check + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup PHP 7.2 + uses: "shivammathur/setup-php@v2" + with: + php-version: "7.2" + extensions: swoole, posix, json + + - name: Setup problem matchers for PHP + run: echo "::add-matcher::${{ runner.tool_cache }}/php.json" + + - name: Validate composer.json + run: "composer validate --strict" + + - name: Get composer cache directory + id: composer-cache + run: echo "::set-output name=dir::$(composer config cache-files-dir)" + + - name: Cache dependencies + uses: actions/cache@v2 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }} + restore-keys: ${{ runner.os }}-composer- + + - name: Install Composer Dependencies + run: "composer install --prefer-dist --no-progress --optimize-autoloader" + - name: Run PHP CS Fixer Check - run: "./vendor/bin/php-cs-fixer fix --dry-run --diff" + run: "composer cs-fix -- --dry-run --diff" diff --git a/composer.json b/composer.json index 5086fcf5..2e1da668 100644 --- a/composer.json +++ b/composer.json @@ -92,7 +92,7 @@ "[ $COMPOSER_DEV_MODE -eq 0 ] || vendor/bin/cghooks add" ], "analyse": "phpstan analyse --memory-limit 300M", - "cs-fix": "php-cs-fixer fix $1", + "cs-fix": "php-cs-fixer fix", "test": "bin/phpunit-swoole --no-coverage" } }