From 577ec47a81b25f4a91dba15af356e3f6480e484e Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Sun, 15 Oct 2023 17:39:35 -0700 Subject: [PATCH] ci: combine PHP jobs Signed-off-by: Varun Patil --- .github/workflows/static-analysis.yaml | 29 +++++++++++++------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 2d36bf6c..02c62a05 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -5,18 +5,8 @@ on: - pull_request jobs: - php-cs-fixer: - name: PHP-CS-Fixer - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: PHP-CS-Fixer - uses: docker://oskarstark/php-cs-fixer-ga - with: - args: --dry-run --diff lib - - pslam: - name: Psalm + php-lint: + name: PHP Lint runs-on: ubuntu-latest steps: - name: Checkout server @@ -39,13 +29,22 @@ jobs: extensions: mbstring, iconv, fileinfo, intl coverage: none - - name: Run Psalm + - name: Install dependencies + working-directory: apps/memories run: | - cd apps/memories make install-tools + + - name: Run Psalm + working-directory: apps/memories + run: | vendor/bin/psalm --no-cache --shepherd --stats --threads=4 lib - vue-tsc-prettier: + - name: Run PHP-CS-Fixer + working-directory: apps/memories + run: | + vendor/bin/php-cs-fixer fix --dry-run --diff lib + + vue-lint: name: Vue Lint runs-on: ubuntu-latest steps: