Skip to content

Commit 6268ab6

Browse files
committed
Back to clunky composer install for better caching
1 parent 9e84178 commit 6268ab6

File tree

1 file changed

+28
-8
lines changed

1 file changed

+28
-8
lines changed

.github/workflows/ci.yml

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
matrix:
6767
php: ['7.3', '7.4', '8.0']
6868
symfony_version: ['4.3.*', '4.4.*', '5.0.*', '5.2.*']
69-
dependencies: ['lowest', 'highest']
69+
dependencies: ['--prefer-lowest', '--prefer-dist']
7070
exclude:
7171
- php: '8.0'
7272
symfony_version: '4.3.*'
@@ -80,6 +80,18 @@ jobs:
8080
steps:
8181
- uses: actions/checkout@v2
8282

83+
- name: Get Composer Cache Directory
84+
id: composer-cache
85+
run: |
86+
echo "::set-output name=dir::$(composer config cache-files-dir)"
87+
88+
- uses: actions/cache@v2
89+
with:
90+
path: ${{ steps.composer-cache.outputs.dir }}
91+
key: composer-${{ matrix.php }}-${{ matrix.symfony_version }}-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}
92+
restore-keys: |
93+
composer-${{ matrix.php }}-${{ matrix.symfony_version }}-${{ matrix.dependencies }}-
94+
8395
- uses: shivammathur/setup-php@v2
8496
with:
8597
php-version: ${{ matrix.php }}
@@ -89,9 +101,7 @@ jobs:
89101

90102
- run: php ./bin/fix-symfony-version.php "${{ matrix.symfony_version }}"
91103

92-
- uses: "ramsey/composer-install@v1"
93-
with:
94-
dependency-versions: ${{ matrix.dependencies }}
104+
- run: composer install --no-progress ${{ matrix.dependencies }}
95105

96106
- run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
97107

@@ -104,7 +114,7 @@ jobs:
104114
matrix:
105115
php: ['7.3', '8.0'] # same as in the container
106116
symfony_version: ['4.3.*', '5.0.*', '5.2.*']
107-
dependencies: ['lowest', 'highest']
117+
dependencies: ['--prefer-lowest', '--prefer-dist']
108118
rdkafka_action: ['exclude-group', 'group']
109119
exclude:
110120
- php: '8.0'
@@ -117,6 +127,18 @@ jobs:
117127
steps:
118128
- uses: actions/checkout@v2
119129

130+
- name: Get Composer Cache Directory
131+
id: composer-cache
132+
run: |
133+
echo "::set-output name=dir::$(composer config cache-files-dir)"
134+
135+
- uses: actions/cache@v2
136+
with:
137+
path: ${{ steps.composer-cache.outputs.dir }}
138+
key: composer-${{ matrix.php }}-${{ matrix.symfony_version }}-${{ matrix.dependencies }}-${{ hashFiles('**/composer.json') }}
139+
restore-keys: |
140+
composer-${{ matrix.php }}-${{ matrix.symfony_version }}-${{ matrix.dependencies }}-
141+
120142
- uses: shivammathur/setup-php@v2
121143
with:
122144
php-version: ${{ matrix.php }}
@@ -126,9 +148,7 @@ jobs:
126148

127149
- run: php ./bin/fix-symfony-version.php "${{ matrix.symfony_version }}"
128150

129-
- uses: "ramsey/composer-install@v1"
130-
with:
131-
dependency-versions: ${{ matrix.dependencies }}
151+
- run: composer install --no-progress ${{ matrix.dependencies }}
132152

133153
- run: sed -i 's/525568/16777471/' vendor/kwn/php-rdkafka-stubs/stubs/constants.php
134154

0 commit comments

Comments
 (0)