Skip to content

Commit 5929cec

Browse files
authored
Merge pull request #18 from dof-dss/upgrade_circleci
Upgrade CirclecI images to PHP 8.1 and drupal-check
2 parents 0725e80 + b97a505 commit 5929cec

File tree

3 files changed

+611
-762
lines changed

3 files changed

+611
-762
lines changed

.circleci/config.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2.1
33
# Default docker image.
44
default_docker_image: &docker_image
55
docker:
6-
- image: thecodingmachine/php:8.0-v4-apache-node14
6+
- image: thecodingmachine/php:8.1-v4-apache-node14
77
environment:
88
PLATFORM_REGION: "uk-1.platform.sh"
99
PROJECT_ROOT: "/home/docker/project"
@@ -14,7 +14,7 @@ default_docker_image: &docker_image
1414
PHP_INI_MAX_INPUT_TIME: 60
1515
custom_npm_docker_image: &custom_npm_docker_image
1616
docker:
17-
- image: circleci/php:8.0-apache-browsers
17+
- image: circleci/php:8.1-apache-browsers
1818
environment:
1919
PLATFORM_REGION: "uk-1.platform.sh"
2020
PROJECT_ROOT: "/home/circleci/project"
@@ -214,7 +214,7 @@ jobs:
214214
name: Backup data sync if the previous attempt failed.
215215
command: |
216216
# Pause for the blocking activity to finish.
217-
sleep 90s
217+
sleep 300s
218218
platform sync data -p $PLATFORM_PROJECT -e $EDGE_BUILD_BRANCH -y
219219
when: on_fail
220220
- run:
@@ -334,7 +334,7 @@ workflows:
334334
triggers:
335335
- schedule:
336336
# At 01:23 Monday to Friday
337-
cron: "23 1 * * 1-5"
337+
cron: "55 1 * * 1-5"
338338
filters:
339339
branches:
340340
only:

composer.json

+3-5
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@
9393
"drupal/date_facet_drilldown": "2.x-dev",
9494
"drupal/diff": "^1.0",
9595
"drupal/draggableviews": "^2.0",
96-
"drupal/embed": "^1.6",
97-
"drupal/entity_browser": "^2.9",
9896
"drupal/entity_embed": "^1.0",
9997
"drupal/entityqueue": "^1.2",
10098
"drupal/eu_cookie_compliance": "^1.8",
@@ -116,7 +114,7 @@
116114
"drupal/link_fix_absolute_urls": "^1.0",
117115
"drupal/linkit": "^6.0.0",
118116
"drupal/media_entity_browser": "^2.0",
119-
"drupal/media_library_edit": "^3.0",
117+
"drupal/media_library_edit": "^2.0",
120118
"drupal/menu_admin_per_menu": "^1.3",
121119
"drupal/menu_breadcrumb": "^1.13",
122120
"drupal/metatag": "1.16.0",
@@ -152,7 +150,6 @@
152150
"drupal/twig_field_value": "^2.0",
153151
"drupal/twig_tweak": "^2.4",
154152
"drupal/ultimate_cron": "^2.0@alpha",
155-
"drupal/upgrade_status": "^3.4",
156153
"drupal/views_contextual_filters_or": "^1.1",
157154
"drupal/views_custom_cache_tag": "^1.1",
158155
"drupal/webform": "^6.0",
@@ -176,8 +173,9 @@
176173
"drupal/migrate_tools": "^5.0",
177174
"drupal/permissions_filter": "^1.1",
178175
"drupal/stage_file_proxy": "^1.1",
176+
"drupal/upgrade_status": "^3.18",
179177
"kint-php/kint": "^3.3",
180-
"mglaman/drupal-check": "^1.1",
178+
"mglaman/drupal-check": "^1.4",
181179
"previousnext/phpunit-finder": "^1.0@alpha",
182180
"slevomat/coding-standard": "^7.0"
183181
},

0 commit comments

Comments
 (0)