Skip to content

Commit

Permalink
Improve Workflow Caches (#2013)
Browse files Browse the repository at this point in the history
* Improve Workflow Caches

* Fix styling

---------

Co-authored-by: lrljoe <lrljoe@users.noreply.github.com>
  • Loading branch information
lrljoe and lrljoe authored Oct 25, 2024
1 parent 9916773 commit 2cd0344
Show file tree
Hide file tree
Showing 6 changed files with 177 additions and 33 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Fix PHP code style issues
uses: aglipanci/laravel-pint-action@latest

- name: Commit changes
- name: Commit styling changes
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: Fix styling
104 changes: 104 additions & 0 deletions .github/workflows/run-phpstan-pull.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
name: run-phpstan-pull

on:
pull_request:
branches:
- 'master'
- 'development'

jobs:
test:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: true
matrix:
os: [ubuntu-latest]
php: [8.3]
laravel: [11]
stability: [prefer-dist]

name: PHPStan - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
env:
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo

steps:
- name: Wait for tests to finish
uses: lewagon/wait-on-check-action@v1.3.4
with:
ref: ${{ github.ref }}
running-workflow-name: 'Run Tests Pull'
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 20

- name: Checkout code
uses: actions/checkout@v4

- name: Setup cache environment
id: extcache
uses: shivammathur/cache-extensions@v1
with:
php-version: ${{ matrix.php }}
extensions: ${{ env.extensions }}
key: ${{ env.extensionKey }}

- name: Cache extensions
uses: actions/cache@v4
with:
path: ${{ steps.extcache.outputs.dir }}
key: ${{ steps.extcache.outputs.key }}
restore-keys: ${{ steps.extcache.outputs.key }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
extensions: ${{ env.extensions }}
coverage: pcov
tools: phpunit:9.5
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Setup problem matchers for PHP
run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"

- name: Get composer cache directory
id: composer-cache
run: |
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
- uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-

- name: Add token
run: |
composer config github-oauth.github.com ${{ secrets.GITHUB_TOKEN }}
- name: Install dependencies
if: steps.composer-cache.outputs.cache-hit != 'true'
run: composer require "laravel/framework:${{ matrix.laravel }}.*" --no-interaction --no-update

- name: Update dependencies
if: steps.composer-cache.outputs.cache-hit != 'true'
run: composer update --${{ matrix.stability }} --no-interaction

- name: Install PHPStan
run: composer require larastan/larastan:^2.0 --no-interaction

- uses: actions/cache/restore@v4
id: larastan-restore
with:
path: ./build/phpstan
key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}

- name: Run PHPStan Tests
run: ./vendor/bin/phpstan analyse

- uses: actions/cache/save@v4
id: larastan-save
with:
path: ./build/phpstan
key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
30 changes: 23 additions & 7 deletions .github/workflows/run-phpstan.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: run-phpstan

on:
pull_request:
branches:
- 'master'
- 'development'
push:
branches:
- '*' # matches every branch that doesn't contain a '/'
Expand All @@ -26,10 +22,18 @@ jobs:

name: PHPStan - P${{ matrix.php }} - L${{ matrix.laravel }} - ${{ matrix.stability }} - ${{ matrix.os }}
env:
extensionKey: phpextensions
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo

steps:
- name: Wait for tests to finish
uses: lewagon/wait-on-check-action@v1.3.4
with:
ref: ${{ github.ref }}
running-workflow-name: 'Run Standard Tests'
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 20

- name: Checkout code
uses: actions/checkout@v4

Expand Down Expand Up @@ -69,8 +73,8 @@ jobs:
- uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-PHPStan-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-
key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-

- name: Add token
run: |
Expand All @@ -87,5 +91,17 @@ jobs:
- name: Install PHPStan
run: composer require larastan/larastan:^2.0 --dev --no-interaction

- uses: actions/cache/restore@v4
id: larastan-restore
with:
path: ./build/phpstan
key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}

- name: Run PHPStan Tests
run: ./vendor/bin/phpstan analyse

- uses: actions/cache/save@v4
id: larastan-save
with:
path: ./build/phpstan
key: phpstan-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
12 changes: 10 additions & 2 deletions .github/workflows/run-tests-pcov-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,14 @@ jobs:
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pcov,pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo

steps:
- name: Wait for tests to finish
uses: lewagon/wait-on-check-action@v1.3.4
with:
ref: ${{ github.ref }}
running-workflow-name: 'Run Tests Pull'
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 20

- name: Checkout code
uses: actions/checkout@v4

Expand Down Expand Up @@ -66,8 +74,8 @@ jobs:
- uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-PCOV-PULL-PHP${{ matrix.php }}-Laravel${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-PCOV-PULL-PHP${{ matrix.php }}-Laravel${{ matrix.laravel }}-composer-
key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-

- name: Add token
run: |
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/run-tests-pull.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: run-tests-pull
name: Run Tests Pull

on:
pull_request:
Expand All @@ -20,7 +20,7 @@ jobs:

name: PULL PHP-${{ matrix.php }} - Laravel-10
env:
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr

steps:
Expand All @@ -39,8 +39,8 @@ jobs:
uses: actions/cache@v4
with:
path: ${{ steps.extcache.outputs.dir }}
key: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
restore-keys: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
key: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
restore-keys: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -64,8 +64,8 @@ jobs:
- uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-

- name: Add token
run: |
Expand Down Expand Up @@ -118,8 +118,8 @@ jobs:
uses: actions/cache@v4
with:
path: ${{ steps.extcache.outputs.dir }}
key: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
restore-keys: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
key: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
restore-keys: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -143,8 +143,8 @@ jobs:
- uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
key: ${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}-composer-

- name: Add token
run: |
Expand All @@ -162,4 +162,4 @@ jobs:
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Run Unit Tests
run: php ./vendor/bin/paratest --no-coverage
run: php ./vendor/bin/phpunit --no-coverage
40 changes: 28 additions & 12 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: run-tests
name: Run Standard Tests

on:
push:
Expand All @@ -22,10 +22,18 @@ jobs:

name: PHP-${{ matrix.php }} - Laravel-10
env:
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr

steps:
- name: Wait for styling to finish
uses: lewagon/wait-on-check-action@v1.3.4
with:
ref: ${{ github.ref }}
running-workflow-name: 'Fix PHP code style issues'
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 20

- name: Checkout code
uses: actions/checkout@v4

Expand All @@ -41,8 +49,8 @@ jobs:
uses: actions/cache@v4
with:
path: ${{ steps.extcache.outputs.dir }}
key: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
restore-keys: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
key: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
restore-keys: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -66,8 +74,8 @@ jobs:
- uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-

- name: Add token
run: |
Expand Down Expand Up @@ -101,10 +109,18 @@ jobs:

name: PHP-${{ matrix.php }} - Laravel-11
env:
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}-L${{ matrix.laravel }}
extensionKey: phpextensions-${{ matrix.os }}-P${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pcov, pdo, sqlite, pdo_sqlite, bcmath, soap, intl, gd, exif, iconv, imagick, fileinfo, :psr

steps:
- name: Wait for styling to finish
uses: lewagon/wait-on-check-action@v1.3.4
with:
ref: ${{ github.ref }}
running-workflow-name: 'Fix PHP code style issues'
repo-token: ${{ secrets.GITHUB_TOKEN }}
wait-interval: 20

- name: Checkout code
uses: actions/checkout@v4

Expand All @@ -120,8 +136,8 @@ jobs:
uses: actions/cache@v4
with:
path: ${{ steps.extcache.outputs.dir }}
key: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
restore-keys: ${{ runner.os }}-${{ steps.extcache.outputs.key }}
key: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}
restore-keys: ${{ matrix.os }}-${{ steps.extcache.outputs.key }}

- name: Setup PHP
uses: shivammathur/setup-php@v2
Expand All @@ -145,8 +161,8 @@ jobs:
- uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-STDPUSH-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-
key: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ matrix.os }}-PHP${{ matrix.php }}-L${{ matrix.laravel }}-composer-

- name: Add token
run: |
Expand All @@ -164,4 +180,4 @@ jobs:
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"

- name: Run Unit Tests
run: php ./vendor/bin/paratest --no-coverage
run: php ./vendor/bin/phpunit --no-coverage

0 comments on commit 2cd0344

Please sign in to comment.