Skip to content

Commit fd5ed02

Browse files
committed
Prepared 1.38.0 release with PHP 8.4.20, theme deps and 'v26.4.0-db11' CI cache.
1 parent 19c6ee7 commit fd5ed02

6 files changed

Lines changed: 195 additions & 172 deletions

File tree

.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,10 @@ jobs:
245245
# Change 'v1' to 'v2', 'v3' etc., commit and push to force cache reset.
246246
# Lookup cache based on the default branch and a timestamp. Allows
247247
# to use cache from the very first build on the day (sanitized database dump, for example).
248-
- v26.2.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-{{ checksum "/tmp/db_cache_timestamp" }}
248+
- v26.4.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-{{ checksum "/tmp/db_cache_timestamp" }}
249249
# Fallback to caching by default branch name only. Allows to use
250250
# cache from the branch build on the previous day.
251-
- v26.2.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-
251+
- v26.4.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-
252252

253253
- run:
254254
name: Download DB
@@ -285,7 +285,7 @@ jobs:
285285
# The cache will not be saved if it already exists.
286286
# Note that the cache fallback flag is enabled for this case in order
287287
# to save cache even if the fallback is not used when restoring it.
288-
key: v26.2.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
288+
key: v26.4.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
289289
paths:
290290
- /root/project/.data
291291

@@ -335,8 +335,8 @@ jobs:
335335
keys:
336336
# Use cached artifacts from previous builds of this branch.
337337
# https://circleci.com/docs/2.0/caching/#restoring-cache
338-
- v26.2.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
339-
- v26.2.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-
338+
- v26.4.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
339+
- v26.4.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-
340340
#;> !PROVISION_TYPE_PROFILE
341341

342342
- *step_setup_remote_docker

.circleci/vortex-test-common.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,10 @@ jobs:
130130
# Change 'v1' to 'v2', 'v3' etc., commit and push to force cache reset.
131131
# Lookup cache based on the default branch and a timestamp. Allows
132132
# to use cache from the very first build on the day (sanitized database dump, for example).
133-
- v26.2.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-{{ checksum "/tmp/db_cache_timestamp" }}
133+
- v26.4.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-{{ checksum "/tmp/db_cache_timestamp" }}
134134
# Fallback to caching by default branch name only. Allows to use
135135
# cache from the branch build on the previous day.
136-
- v26.2.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-
136+
- v26.4.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback" }}-
137137

138138
- run:
139139
name: Download DB
@@ -170,7 +170,7 @@ jobs:
170170
# The cache will not be saved if it already exists.
171171
# Note that the cache fallback flag is enabled for this case in order
172172
# to save cache even if the fallback is not used when restoring it.
173-
key: v26.2.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
173+
key: v26.4.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
174174
paths:
175175
- /root/project/.data
176176

@@ -201,8 +201,8 @@ jobs:
201201
keys:
202202
# Use cached artifacts from previous builds of this branch.
203203
# https://circleci.com/docs/2.0/caching/#restoring-cache
204-
- v26.2.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
205-
- v26.2.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-
204+
- v26.4.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-{{ checksum "/tmp/db_cache_timestamp" }}
205+
- v26.4.0-db11-{{ checksum "/tmp/db_cache_branch" }}-{{ checksum "/tmp/db_cache_fallback_yes" }}-
206206
#;> !PROVISION_TYPE_PROFILE
207207

208208
- *step_setup_remote_docker

.github/workflows/build-test-deploy.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -262,11 +262,11 @@ jobs:
262262
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5
263263
with:
264264
path: .data
265-
key: v26.2.0-db11-${{ hashFiles('db_cache_branch') }}-${{ hashFiles('db_cache_fallback') }}-${{ hashFiles('db_cache_timestamp') }}
265+
key: v26.4.0-db11-${{ hashFiles('db_cache_branch') }}-${{ hashFiles('db_cache_fallback') }}-${{ hashFiles('db_cache_timestamp') }}
266266
# Fallback to caching by default branch name only. Allows to use
267267
# cache from the branch build on the previous day.
268268
restore-keys: |
269-
v26.2.0-db11-${{ hashFiles('db_cache_branch') }}-${{ hashFiles('db_cache_fallback') }}-
269+
v26.4.0-db11-${{ hashFiles('db_cache_branch') }}-${{ hashFiles('db_cache_fallback') }}-
270270
271271
- name: Download DB
272272
run: |
@@ -303,7 +303,7 @@ jobs:
303303
if: env.db_hash != hashFiles('.data')
304304
with:
305305
path: .data
306-
key: v26.2.0-db11-${{ hashFiles('db_cache_branch') }}-${{ hashFiles('db_cache_fallback_yes') }}-${{ hashFiles('db_cache_timestamp') }}
306+
key: v26.4.0-db11-${{ hashFiles('db_cache_branch') }}-${{ hashFiles('db_cache_fallback_yes') }}-${{ hashFiles('db_cache_timestamp') }}
307307
#;> !PROVISION_TYPE_PROFILE
308308

309309
build:
@@ -371,7 +371,7 @@ jobs:
371371
date "${VORTEX_CI_DB_CACHE_TIMESTAMP}" | tee db_cache_timestamp
372372
373373
- name: Show cache key for database caching
374-
run: echo 'v26.2.0-db11-${{ hashFiles('db_cache_branch') }}-${{ hashFiles('db_cache_fallback_yes') }}-${{ hashFiles('db_cache_timestamp') }}'
374+
run: echo 'v26.4.0-db11-${{ hashFiles('db_cache_branch') }}-${{ hashFiles('db_cache_fallback_yes') }}-${{ hashFiles('db_cache_timestamp') }}'
375375

376376
# Restore DB cache based on the cache strategy set by the cache keys below.
377377
# Change 'v1' to 'v2', 'v3' etc., commit and push to force cache reset.
@@ -383,9 +383,9 @@ jobs:
383383
path: .data
384384
fail-on-cache-miss: true
385385
# Use cached database from previous builds of this branch.
386-
key: v26.2.0-db11-${{ hashFiles('db_cache_branch') }}-${{ hashFiles('db_cache_fallback_yes') }}-${{ hashFiles('db_cache_timestamp') }}
386+
key: v26.4.0-db11-${{ hashFiles('db_cache_branch') }}-${{ hashFiles('db_cache_fallback_yes') }}-${{ hashFiles('db_cache_timestamp') }}
387387
restore-keys: |
388-
v26.2.0-db11-${{ hashFiles('db_cache_branch') }}-${{ hashFiles('db_cache_fallback_yes') }}-
388+
v26.4.0-db11-${{ hashFiles('db_cache_branch') }}-${{ hashFiles('db_cache_fallback_yes') }}-
389389
#;> !PROVISION_TYPE_PROFILE
390390

391391
- name: Login to container registry

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"bump-after-update": true,
103103
"discard-changes": true,
104104
"platform": {
105-
"php": "8.4.17"
105+
"php": "8.4.20"
106106
},
107107
"sort-packages": true
108108
},

phpstan.neon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ parameters:
1111

1212
level: 7
1313

14-
phpVersion: 80417
14+
phpVersion: 80420
1515

1616
paths:
1717
- web/modules/custom

0 commit comments

Comments
 (0)