Skip to content

Commit 7cd4f02

Browse files
committed
Merge remote-tracking branch 'origin/main' into 1.x
# Conflicts: # .github/workflows/format_php.yml
2 parents d4dbb35 + 6179b0f commit 7cd4f02

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

.github/workflows/phpcs-ruleset-validator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
echo "composer_dir={$(composer config cache-files-dir)}" >> $GITHUB_OUTPUT
3030
3131
- name: Retrieve Composer‘s cache
32-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6
32+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
3333
with:
3434
path: ${{ steps.composer-cache.outputs.composer_dir }}
3535
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}

.github/workflows/psalm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
echo "composer_dir={$(composer config cache-files-dir)}" >> $GITHUB_OUTPUT
3737
3838
- name: Retrieve Composer‘s cache
39-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6
39+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
4040
with:
4141
path: ${{ steps.composer-cache.outputs.composer_dir }}
4242
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
@@ -49,7 +49,7 @@ jobs:
4949
# the way cache keys are set up will always cause a cache miss
5050
# but will restore the cache generated during the previous run based on partial match
5151
- name: Retrieve Psalm’s cache
52-
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # v6
52+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6
5353
with:
5454
path: ./cache/psalm
5555
key: ${{ runner.os }}-psalm-cache-${{ hashFiles('psalm.xml', 'psalm-baseline.xml') }}

0 commit comments

Comments
 (0)