Skip to content

Commit 7c34216

Browse files
authored
Updated Vortex to 1.38.0. (#169)
* Applied Vortex scaffold updates. * Reconciled CI workflows with Vortex 1.38.0. * Reconciled .ahoy.yml with Vortex 1.38.0. * Updated Vortex version badge. * Reconciled composer with Vortex 1.38.0. * Accepted Vortex change to 'tests/behat/features/homepage.feature'. * Accepted Vortex change to 'tests/behat/features/login.feature'. * Accepted Vortex change to 'tests/phpunit/Drupal/SettingsTestCase.php'. * Accepted Vortex change to 'web/modules/custom/do_base/tests/'. * Applied Vortex update to '.docker/clamav.dockerfile'. * Applied Vortex update to '.docker/cli.dockerfile'. * Applied Vortex update to '.docker/database.dockerfile'. * Applied Vortex update to '.docker/nginx-drupal.dockerfile'. * Applied Vortex update to '.docker/php.dockerfile'. * Applied Vortex update to '.docker/solr.dockerfile'. * Applied Vortex update to '.eslintrc.json'. * Applied Vortex update to 'renovate.json'. * Applied Vortex update to 'AGENTS.md'. * Applied Vortex update to 'web/sites/default/includes/modules/settings.seckit.php'. * Applied Vortex update to 'web/sites/default/includes/modules/settings.shield.php'. * Applied Vortex update to 'web/sites/default/includes/modules/settings.stage_file_proxy.php'. * Applied Vortex update to 'web/sites/default/includes/modules/settings.trusted_hosts.php'. * Applied Vortex update to 'web/sites/default/includes/providers/settings.container.php'. * Applied Vortex update to 'yarn.lock'. * Fixed test-unit failure: added 'seckit_xss.csp.checkbox' assertion. * Fixed lint failure: removed trailing blank lines from docblocks. * Fixed CI Behat failure: reverted 'login.feature' to project's role-based login. * Fixed CI Behat failures: reverted 'behat.yml' region_map and selectors to project's CivicTheme values. * Addressed code review: fixed 'getValue' argument in 'ReflectionTrait::getProtectedValue'. * Addressed code review: typed parameters of 'ReflectionTrait::getProtectedValue'.
1 parent 7d948e9 commit 7c34216

82 files changed

Lines changed: 3488 additions & 494 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ahoy.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ commands:
2828
info:
2929
usage: Show information about this project.
3030
cmd: |
31-
COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-${PWD##*/}} \
32-
VORTEX_HOST_DB_PORT=$(docker compose port database 3306 2>/dev/null | cut -d : -f 2) \
33-
VORTEX_HOST_SOLR_PORT=$(docker compose port solr 8983 2>/dev/null | cut -d : -f 2) \
34-
VORTEX_HOST_SELENIUM_VNC_PORT=$(docker compose port chrome 7900 2>/dev/null | cut -d : -f 2) \
35-
VORTEX_HOST_HAS_SEQUELACE=$(uname -a | grep -i -q darwin && mdfind -name 'Sequel Ace' 2>/dev/null | grep -q "Ace" && echo 1 || true) \
31+
export COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-${PWD##*/}}
32+
export VORTEX_HOST_DB_PORT=$(docker compose port database 3306 2>/dev/null | cut -d : -f 2)
33+
export VORTEX_HOST_SOLR_PORT=$(docker compose port solr 8983 2>/dev/null | cut -d : -f 2)
34+
export VORTEX_HOST_SELENIUM_VNC_PORT=$(docker compose port chrome 7900 2>/dev/null | cut -d : -f 2)
35+
export VORTEX_HOST_HAS_SEQUELACE=$(uname -a | grep -i -q darwin && mdfind -name 'Sequel Ace' 2>/dev/null | grep -q "Ace" && echo 1 || true)
3636
ahoy cli ./scripts/vortex/info.sh "$@"
3737
3838
db:
@@ -235,7 +235,6 @@ commands:
235235
cmd: ahoy cli vendor/bin/phpunit --testsuite=functional "$@"
236236

237237
test-functional-javascript:
238-
aliases: [test-js]
239238
usage: Run PHPUnit functional JavaScript tests.
240239
cmd: ahoy cli vendor/bin/phpunit --testsuite=functional-javascript "$@"
241240

.docker/clamav.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
# @see https://hub.docker.com/r/uselagoon/commons/tags
1111
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/commons
1212

13-
FROM uselagoon/commons:26.3.0 AS commons
13+
FROM uselagoon/commons:26.4.0 AS commons
1414

15-
FROM clamav/clamav-debian:1.5.2-34
15+
FROM clamav/clamav-debian:1.5.2-37
1616

1717
COPY --from=commons /lagoon /lagoon
1818
COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/

.docker/cli.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
#
55
# hadolint global ignore=DL3018,SC2174
66
#
7-
# @see https://hub.docker.com/r/uselagoon/php-8.3-cli-drupal/tags
7+
# @see https://hub.docker.com/r/uselagoon/php-8.4-cli-drupal/tags
88
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal
99

10-
FROM uselagoon/php-8.3-cli-drupal:26.3.0
10+
FROM uselagoon/php-8.4-cli-drupal:26.4.0
1111

1212
# Add missing variables.
1313
# @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.

.docker/database.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# The ARG value will be updated with a value passed from docker-compose.yml
77

8-
ARG IMAGE=uselagoon/mysql-8.4:26.3.0
8+
ARG IMAGE=uselagoon/mysql-8.4:26.4.0
99
# hadolint ignore=DL3006
1010
FROM ${IMAGE}
1111

.docker/nginx-drupal.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ARG CLI_IMAGE
1111
# hadolint ignore=DL3006
1212
FROM ${CLI_IMAGE:-cli} AS cli
1313

14-
FROM uselagoon/nginx-drupal:26.3.0
14+
FROM uselagoon/nginx-drupal:26.4.0
1515

1616
# Webroot is used for Nginx web root configuration.
1717
ARG WEBROOT=web

.docker/php.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
#
66
# hadolint global ignore=DL3018
77
#
8-
# @see https://hub.docker.com/r/uselagoon/php-8.3-fpm/tags
8+
# @see https://hub.docker.com/r/uselagoon/php-8.4-fpm/tags
99
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-fpm
1010

1111
ARG CLI_IMAGE
1212
# hadolint ignore=DL3006
1313
FROM ${CLI_IMAGE:-cli} AS cli
1414

15-
FROM uselagoon/php-8.3-fpm:26.3.0
15+
FROM uselagoon/php-8.4-fpm:26.4.0
1616

1717
RUN apk add --no-cache tzdata
1818

.docker/solr.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# @see https://hub.docker.com/r/uselagoon/solr-9-drupal/tags
66
# @see https://github.com/uselagoon/lagoon-images/blob/main/images/solr-drupal/9.Dockerfile
77

8-
FROM uselagoon/solr-9-drupal:26.3.0
8+
FROM uselagoon/solr-9-drupal:26.4.0
99

1010
# Solr jump-start config needs to be manually copied from the search_api_solr
1111
# Drupal module to .docker/config/solr/config-set.

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ drush/contrib/
4040
!composer.lock
4141
!gherkinlint.json
4242
!package-lock.json
43+
!jest.config.js
4344
!package.json
4445
!patches
4546
!phpcs.xml

.eslintrc.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,18 @@
6161
"operator-linebreak": ["error", "after", { "overrides": { "?": "ignore", ":": "ignore" } }],
6262
"yml/indent": ["error", 2]
6363
},
64+
"overrides": [
65+
{
66+
"files": ["*.test.js"],
67+
"env": { "jest": true },
68+
"rules": {
69+
"global-require": "off",
70+
"import/extensions": "off",
71+
"max-nested-callbacks": ["warn", 5],
72+
"jsdoc/check-tag-names": "off"
73+
}
74+
}
75+
],
6476
"settings": {
6577
"jsdoc": {
6678
"tagNamePreference": {

.github/workflows/assign-author.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ jobs:
1515

1616
steps:
1717
- name: Assign author
18-
uses: toshimaru/auto-author-assign@4d585cc37690897bd9015942ed6e766aa7cdb97f # v3.0.1
18+
uses: toshimaru/auto-author-assign@bdd7688cbf9e6d5683f02f8c7d8ae4062a254b6d # v3.0.2

0 commit comments

Comments
 (0)