Skip to content

chore: normalize Actions cache keys #10614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
paulbalandan merged 1 commit into from
Oct 9, 2026
Merged

chore: normalize Actions cache keys #10614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/reusable-coveralls.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ jobs:
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
key: ${{ github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
key: composer-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.json') }}
restore-keys: |
${{ github.job }}-php-${{ inputs.php-version }}-
${{ github.job }}-
composer-php-${{ inputs.php-version }}-
composer-

- name: Cache PHPUnit's static analysis cache
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/reusable-phpunit-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,11 +195,10 @@ jobs:
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ${{ steps.setup-env.outputs.COMPOSER_CACHE_FILES_DIR }}
key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}-${{ hashFiles('**/composer.*') }}
key: composer-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.json') }}
restore-keys: |
${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-db-${{ inputs.db-platform || 'none' }}-
${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-
${{ inputs.job-id || github.job }}-
composer-php-${{ inputs.php-version }}-
composer-

- name: Cache PHPUnit's static analysis cache
if: ${{ inputs.enable-artifact-upload }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/reusable-serviceless-phpunit-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ jobs:
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ${{ steps.setup-env.outputs.COMPOSER_CACHE_FILES_DIR }}
key: ${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.*') }}
key: composer-php-${{ inputs.php-version }}-${{ hashFiles('**/composer.json') }}
restore-keys: |
${{ inputs.job-id || github.job }}-php-${{ inputs.php-version }}-
${{ inputs.job-id || github.job }}-
composer-php-${{ inputs.php-version }}-
composer-

- name: Cache PHPUnit's static analysis cache
if: ${{ inputs.enable-artifact-upload }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/test-coding-standards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,10 @@ jobs:
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
key: ${{ runner.os }}-${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
restore-keys: |
${{ runner.os }}-${{ matrix.php-version }}-
${{ runner.os }}-
composer-php-${{ matrix.php-version }}-
composer-

- name: Install dependencies
run: composer update --ansi --no-interaction ${{ matrix.composer-option }}
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/test-phpstan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,10 @@ jobs:
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-composer-
key: composer-php-8.2-${{ hashFiles('**/composer.json') }}
restore-keys: |
composer-php-8.2-
composer-

- name: Create PHPStan result cache directory
run: mkdir -p build/phpstan
Expand All @@ -79,8 +81,8 @@ jobs:
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: build/phpstan
key: ${{ runner.os }}-phpstan-${{ github.sha }}
restore-keys: ${{ runner.os }}-phpstan-
key: phpstan-${{ hashFiles('**/*.php', '**/*.neon', 'composer.json') }}
restore-keys: phpstan-

- name: Install dependencies
run: composer update --ansi --no-interaction
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/test-psalm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ jobs:
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}-${{ hashFiles('**/composer.lock') }}
restore-keys: ${{ runner.os }}-composer-
key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
restore-keys: |
composer-php-${{ matrix.php-version }}-
composer-

- name: Create Psalm cache directory
run: mkdir -p build/psalm
Expand All @@ -67,8 +69,8 @@ jobs:
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: build/psalm
key: ${{ runner.os }}-psalm-${{ github.sha }}
restore-keys: ${{ runner.os }}-psalm-
key: psalm-${{ hashFiles('**/*.php', 'psalm*.xml', 'composer.json') }}
restore-keys: psalm-

- name: Install dependencies
run: |
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/test-random-execution.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,10 @@ jobs:
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
key: PHP_${{ matrix.php-version }}-${{ hashFiles('**/composer.*') }}
key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
restore-keys: |
PHP_${{ matrix.php-version }}-
composer-php-${{ matrix.php-version }}-
composer-

- name: Install project dependencies
run: |
Expand Down
16 changes: 9 additions & 7 deletions .github/workflows/test-rector.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,20 +75,22 @@ jobs:
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-composer-

- name: Install dependencies
run: composer update --ansi --no-interaction ${{ matrix.composer-option }}
key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
restore-keys: |
composer-php-${{ matrix.php-version }}-
composer-

- name: Rector Cache
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: /tmp/rector
key: ${{ runner.os }}-rector-${{ github.run_id }}
restore-keys: ${{ runner.os }}-rector-
key: rector-${{ hashFiles('**/*.php', 'composer.json') }}
restore-keys: rector-

- run: mkdir -p /tmp/rector

- name: Install dependencies
run: composer update --ansi --no-interaction ${{ matrix.composer-option }}

- name: Run static analysis
run: vendor/bin/rector process --dry-run --no-progress-bar
16 changes: 9 additions & 7 deletions .github/workflows/test-structarmed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,20 +72,22 @@ jobs:
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: ${{ steps.composer-cache.outputs.COMPOSER_CACHE_FILES_DIR }}
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
restore-keys: ${{ runner.os }}-composer-

- name: Install dependencies
run: composer update --ansi --no-interaction
key: composer-php-${{ matrix.php-version }}-${{ hashFiles('**/composer.json') }}
restore-keys: |
composer-php-${{ matrix.php-version }}-
composer-

- name: Structarmed Cache
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
with:
path: /tmp/structarmed
key: ${{ runner.os }}-structarmed-${{ github.run_id }}
restore-keys: ${{ runner.os }}-structarmed-
key: structarmed-${{ hashFiles('**/*.php', 'composer.json') }}
restore-keys: structarmed-

- run: mkdir -p /tmp/structarmed

- name: Install dependencies
run: composer update --ansi --no-interaction

- name: Run static analysis
run: vendor/bin/structarmed analyze
Loading