Skip to content

Commit 463db6f

Browse files
committed
Added support for PHP 8.4 for CircleCI builds.
1 parent 114df68 commit 463db6f

File tree

2 files changed

+17
-7
lines changed

2 files changed

+17
-7
lines changed

.circleci/config.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,13 @@ job-test: &job-test
3737
echo "extension=pcov.so" | sudo tee -a /usr/local/etc/php/conf.d/pcov.ini
3838
echo "pcov.enabled=1" | sudo tee -a /usr/local/etc/php/conf.d/pcov.ini
3939
40+
- run:
41+
name: Update SYMFONY_DEPRECATIONS_HELPER for PHP 8.4
42+
command: |
43+
if [ "$(php -r 'echo PHP_MAJOR_VERSION . \".\" . PHP_MINOR_VERSION;')" == "8.4" ]; then
44+
echo "SYMFONY_DEPRECATIONS_HELPER=disabled" >> $BASH_ENV
45+
fi
46+
4047
- run:
4148
name: Assemble the codebase
4249
command: .devtools/assemble.sh
@@ -152,23 +159,23 @@ jobs:
152159
test-php-8.4-d10-legacy:
153160
<<: *container_config
154161
docker:
155-
- image: cimg/php:8.3-browsers # PHP 8.4 is not available yet.
162+
- image: cimg/php:8.4-browsers
156163
environment:
157164
DRUPAL_VERSION: 10.3 # Lowest Drupal version that supports PHP 8.4.
158165
<<: *job-test
159166

160167
test-php-8.4-d10-stable:
161168
<<: *container_config
162169
docker:
163-
- image: cimg/php:8.3-browsers # PHP 8.4 is not available yet.
170+
- image: cimg/php:8.4-browsers
164171
environment:
165172
DRUPAL_VERSION: 10.3
166173
<<: *job-test
167174

168175
test-php-8.4-d10-canary:
169176
<<: *container_config
170177
docker:
171-
- image: cimg/php:8.3-browsers # PHP 8.4 is not available yet.
178+
- image: cimg/php:8.4-browsers
172179
environment:
173180
DRUPAL_VERSION: 10.4@beta
174181
CI_PHPSTAN_IGNORE_FAILURE: 1 # PHPStan levels for canary releases are not the same as for this project.
@@ -202,23 +209,23 @@ jobs:
202209
test-php-8.4-d11-legacy:
203210
<<: *container_config
204211
docker:
205-
- image: cimg/php:8.3-browsers # PHP 8.4 is not available yet.
212+
- image: cimg/php:8.4-browsers
206213
environment:
207214
DRUPAL_VERSION: 11.0 # Lowest Drupal version that exists.
208215
<<: *job-test
209216

210217
test-php-8.4-d11-stable:
211218
<<: *container_config
212219
docker:
213-
- image: cimg/php:8.3-browsers # PHP 8.4 is not available yet.
220+
8.4.1-browsers
214221
environment:
215222
DRUPAL_VERSION: 11.0
216223
<<: *job-test
217224

218225
test-php-8.4-d11-canary:
219226
<<: *container_config
220227
docker:
221-
- image: cimg/php:8.3-browsers # PHP 8.4 is not available yet.
228+
- image: cimg/php:8.4-browsers
222229
environment:
223230
DRUPAL_VERSION: 11@beta
224231
CI_PHPSTAN_IGNORE_FAILURE: 1 # PHPStan levels for canary releases are not the same as for this project.

.github/workflows/test.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,10 @@ jobs:
114114
# versions of Drupal 10 and 11 fully support PHP 8.4.
115115
# @see https://www.drupal.org/project/drupal/issues/1267246
116116
- name: Update SYMFONY_DEPRECATIONS_HELPER for PHP 8.4
117-
run: if [ "${{ matrix.php-version }}" == "8.4" ]; then echo "SYMFONY_DEPRECATIONS_HELPER=disabled" >> "$GITHUB_ENV"; fi
117+
run: |
118+
if [ "$(php -r 'echo PHP_MAJOR_VERSION . \".\" . PHP_MINOR_VERSION;')" == "8.4" ]; then
119+
echo "SYMFONY_DEPRECATIONS_HELPER=disabled" >> "$GITHUB_ENV"
120+
fi
118121
119122
- name: Assemble the codebase
120123
run: .devtools/assemble.sh

0 commit comments

Comments
 (0)