Skip to content

Commit 90acbcc

Browse files
committed
refactor(workflows): simplify Composer caching in reports, tests, and wiki workflows
Signed-off-by: Felipe Sayão Lobato Abreu <github@mentordosnerds.com>
1 parent bda2f6d commit 90acbcc

3 files changed

Lines changed: 14 additions & 26 deletions

File tree

.github/workflows/reports.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,18 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v6
2424

25-
- name: Get Composer Cache Directory
26-
id: composer-cache
27-
run: |
28-
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
29-
3025
- name: Cache Composer dependencies
3126
uses: actions/cache@v5
3227
with:
33-
path: ${{ steps.composer-cache.outputs.dir }}
34-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
35-
restore-keys: |
36-
${{ runner.os }}-composer-
37-
28+
path: /tmp/composer-cache
29+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
30+
restore-keys: |
31+
${{ runner.os }}-composer-
3832
- name: Install dependencies
3933
uses: php-actions/composer@v6
4034
env:
4135
COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ github.token }}"} }'
36+
COMPOSER_CACHE_DIR: /tmp/composer-cache
4237
with:
4338
php_version: '8.3'
4439

.github/workflows/tests.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,19 @@ jobs:
3838
steps:
3939
- uses: actions/checkout@v6
4040

41-
- name: Get Composer Cache Directory
42-
id: composer-cache
43-
run: |
44-
echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
45-
4641
- name: Cache Composer dependencies
4742
uses: actions/cache@v5
4843
with:
49-
path: ${{ steps.composer-cache.outputs.dir }}
50-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
51-
restore-keys: |
52-
${{ runner.os }}-composer-
44+
path: /tmp/composer-cache
45+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
46+
restore-keys: |
47+
${{ runner.os }}-composer-
5348
5449
- name: Install dependencies
5550
uses: php-actions/composer@v6
5651
env:
5752
COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ github.token }}"} }'
53+
COMPOSER_CACHE_DIR: /tmp/composer-cache
5854
with:
5955
php_version: ${{ matrix.php-version }}
6056

.github/workflows/wiki.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,19 @@ jobs:
2626
submodules: recursive
2727
fetch-depth: 0
2828

29-
- name: Get Composer Cache Directory
30-
id: composer-cache
31-
run: echo "dir=$(composer config cache-files-dir)" >> "$GITHUB_OUTPUT"
32-
3329
- name: Cache Composer dependencies
3430
uses: actions/cache@v5
3531
with:
36-
path: ${{ steps.composer-cache.outputs.dir }}
37-
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
32+
path: /tmp/composer-cache
33+
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
3834
restore-keys: |
3935
${{ runner.os }}-composer-
4036
4137
- name: Install dependencies
4238
uses: php-actions/composer@v6
4339
env:
4440
COMPOSER_AUTH: '{"github-oauth": {"github.com": "${{ github.token }}"} }'
41+
COMPOSER_CACHE_DIR: /tmp/composer-cache
4542
with:
4643
php_version: '8.3'
4744

@@ -80,4 +77,4 @@ jobs:
8077
message: "Update wiki submodule pointer"
8178
default_author: github_actions
8279
pull: "--rebase --autostash"
83-
push: true
80+
push: true

0 commit comments

Comments
 (0)