Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
48801be
Applied Vortex scaffold updates.
AlexSkrypnyk May 8, 2026
765baf4
Reconciled CI workflows with Vortex 1.38.0.
AlexSkrypnyk May 8, 2026
0fa4f70
Reconciled .ahoy.yml with Vortex 1.38.0.
AlexSkrypnyk May 8, 2026
f5ef344
Updated Vortex version badge.
AlexSkrypnyk May 8, 2026
2336c2c
Reconciled composer with Vortex 1.38.0.
AlexSkrypnyk May 8, 2026
47b6adb
Accepted Vortex change to 'tests/behat/features/homepage.feature'.
AlexSkrypnyk May 9, 2026
d9c76cf
Accepted Vortex change to 'tests/behat/features/login.feature'.
AlexSkrypnyk May 9, 2026
6156e2b
Accepted Vortex change to 'tests/phpunit/Drupal/SettingsTestCase.php'.
AlexSkrypnyk May 9, 2026
6c2af37
Accepted Vortex change to 'web/modules/custom/do_base/tests/'.
AlexSkrypnyk May 9, 2026
6870557
Applied Vortex update to '.docker/clamav.dockerfile'.
AlexSkrypnyk May 9, 2026
7f7c002
Applied Vortex update to '.docker/cli.dockerfile'.
AlexSkrypnyk May 9, 2026
7579f4f
Applied Vortex update to '.docker/database.dockerfile'.
AlexSkrypnyk May 9, 2026
3ed4a23
Applied Vortex update to '.docker/nginx-drupal.dockerfile'.
AlexSkrypnyk May 9, 2026
341e403
Applied Vortex update to '.docker/php.dockerfile'.
AlexSkrypnyk May 9, 2026
3c77249
Applied Vortex update to '.docker/solr.dockerfile'.
AlexSkrypnyk May 9, 2026
7a8126a
Applied Vortex update to '.eslintrc.json'.
AlexSkrypnyk May 9, 2026
a097b25
Applied Vortex update to 'renovate.json'.
AlexSkrypnyk May 9, 2026
3953138
Applied Vortex update to 'AGENTS.md'.
AlexSkrypnyk May 9, 2026
af46fe7
Applied Vortex update to 'web/sites/default/includes/modules/settings…
AlexSkrypnyk May 9, 2026
628a30c
Applied Vortex update to 'web/sites/default/includes/modules/settings…
AlexSkrypnyk May 9, 2026
b41e637
Applied Vortex update to 'web/sites/default/includes/modules/settings…
AlexSkrypnyk May 9, 2026
91740fc
Applied Vortex update to 'web/sites/default/includes/modules/settings…
AlexSkrypnyk May 9, 2026
0f056de
Applied Vortex update to 'web/sites/default/includes/providers/settin…
AlexSkrypnyk May 9, 2026
09c6be6
Applied Vortex update to 'yarn.lock'.
AlexSkrypnyk May 9, 2026
e3eb919
Fixed test-unit failure: added 'seckit_xss.csp.checkbox' assertion.
AlexSkrypnyk May 9, 2026
961e446
Fixed lint failure: removed trailing blank lines from docblocks.
AlexSkrypnyk May 9, 2026
d41ab39
Fixed CI Behat failure: reverted 'login.feature' to project's role-ba…
AlexSkrypnyk May 9, 2026
8d270a4
Fixed CI Behat failures: reverted 'behat.yml' region_map and selector…
AlexSkrypnyk May 9, 2026
2d29d5f
Addressed code review: fixed 'getValue' argument in 'ReflectionTrait:…
AlexSkrypnyk May 9, 2026
5d4df46
Addressed code review: typed parameters of 'ReflectionTrait::getProte…
AlexSkrypnyk May 9, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions .ahoy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ commands:
info:
usage: Show information about this project.
cmd: |
COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-${PWD##*/}} \
VORTEX_HOST_DB_PORT=$(docker compose port database 3306 2>/dev/null | cut -d : -f 2) \
VORTEX_HOST_SOLR_PORT=$(docker compose port solr 8983 2>/dev/null | cut -d : -f 2) \
VORTEX_HOST_SELENIUM_VNC_PORT=$(docker compose port chrome 7900 2>/dev/null | cut -d : -f 2) \
VORTEX_HOST_HAS_SEQUELACE=$(uname -a | grep -i -q darwin && mdfind -name 'Sequel Ace' 2>/dev/null | grep -q "Ace" && echo 1 || true) \
export COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-${PWD##*/}}
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vortex 1.38.0: drevops/vortex#2390

ahoy info now exports its discovered host/port variables (COMPOSE_PROJECT_NAME, VORTEX_HOST_DB_PORT, etc.) so the subsequent ahoy cli ./scripts/vortex/info.sh invocation - and any other commands in the same shell context - can read them. Previously these were inline-assigned with trailing-backslash continuation, which only made them visible to the immediate next command.

export VORTEX_HOST_DB_PORT=$(docker compose port database 3306 2>/dev/null | cut -d : -f 2)
export VORTEX_HOST_SOLR_PORT=$(docker compose port solr 8983 2>/dev/null | cut -d : -f 2)
export VORTEX_HOST_SELENIUM_VNC_PORT=$(docker compose port chrome 7900 2>/dev/null | cut -d : -f 2)
export VORTEX_HOST_HAS_SEQUELACE=$(uname -a | grep -i -q darwin && mdfind -name 'Sequel Ace' 2>/dev/null | grep -q "Ace" && echo 1 || true)
ahoy cli ./scripts/vortex/info.sh "$@"

db:
Expand Down Expand Up @@ -235,7 +235,6 @@ commands:
cmd: ahoy cli vendor/bin/phpunit --testsuite=functional "$@"

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

Expand Down
4 changes: 2 additions & 2 deletions .docker/clamav.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
# @see https://hub.docker.com/r/uselagoon/commons/tags
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/commons

FROM uselagoon/commons:26.3.0 AS commons
FROM uselagoon/commons:26.4.0 AS commons
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vortex 1.38.0: drevops/vortex#2471

Lagoon container images bumped 26.3.026.4.0 across the stack: commons here, plus cli, php-fpm, nginx-drupal, mysql-8.4, and solr-9-drupal in their respective Dockerfiles. The DB cache key prefix in .github/workflows/build-test-deploy.yml bumps in lockstep (v26.2.0-db11-...v26.4.0-db11-...). clamav-debian also rolled 1.5.2-341.5.2-37.


FROM clamav/clamav-debian:1.5.2-34
FROM clamav/clamav-debian:1.5.2-37

COPY --from=commons /lagoon /lagoon
COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/wait-for /bin/
Expand Down
4 changes: 2 additions & 2 deletions .docker/cli.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
#
# hadolint global ignore=DL3018,SC2174
#
# @see https://hub.docker.com/r/uselagoon/php-8.3-cli-drupal/tags
# @see https://hub.docker.com/r/uselagoon/php-8.4-cli-drupal/tags
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-cli-drupal

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

# Add missing variables.
# @todo Remove once https://github.com/uselagoon/lagoon/issues/3121 is resolved.
Expand Down
2 changes: 1 addition & 1 deletion .docker/database.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#
# The ARG value will be updated with a value passed from docker-compose.yml

ARG IMAGE=uselagoon/mysql-8.4:26.3.0
ARG IMAGE=uselagoon/mysql-8.4:26.4.0
# hadolint ignore=DL3006
FROM ${IMAGE}

Expand Down
2 changes: 1 addition & 1 deletion .docker/nginx-drupal.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ARG CLI_IMAGE
# hadolint ignore=DL3006
FROM ${CLI_IMAGE:-cli} AS cli

FROM uselagoon/nginx-drupal:26.3.0
FROM uselagoon/nginx-drupal:26.4.0

# Webroot is used for Nginx web root configuration.
ARG WEBROOT=web
Expand Down
4 changes: 2 additions & 2 deletions .docker/php.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
#
# hadolint global ignore=DL3018
#
# @see https://hub.docker.com/r/uselagoon/php-8.3-fpm/tags
# @see https://hub.docker.com/r/uselagoon/php-8.4-fpm/tags
# @see https://github.com/uselagoon/lagoon-images/tree/main/images/php-fpm

ARG CLI_IMAGE
# hadolint ignore=DL3006
FROM ${CLI_IMAGE:-cli} AS cli

FROM uselagoon/php-8.3-fpm:26.3.0
FROM uselagoon/php-8.4-fpm:26.4.0

RUN apk add --no-cache tzdata

Expand Down
2 changes: 1 addition & 1 deletion .docker/solr.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# @see https://hub.docker.com/r/uselagoon/solr-9-drupal/tags
# @see https://github.com/uselagoon/lagoon-images/blob/main/images/solr-drupal/9.Dockerfile

FROM uselagoon/solr-9-drupal:26.3.0
FROM uselagoon/solr-9-drupal:26.4.0

# Solr jump-start config needs to be manually copied from the search_api_solr
# Drupal module to .docker/config/solr/config-set.
Expand Down
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ drush/contrib/
!composer.lock
!gherkinlint.json
!package-lock.json
!jest.config.js
!package.json
!patches
!phpcs.xml
Expand Down
12 changes: 12 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,18 @@
"operator-linebreak": ["error", "after", { "overrides": { "?": "ignore", ":": "ignore" } }],
"yml/indent": ["error", 2]
},
"overrides": [
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Vortex 1.38.0: drevops/vortex#2418

Vortex 1.38.0 added Jest as the JavaScript unit-test runner. This overrides block applies Jest globals and relaxes a few rules for *.test.js files (global-require off, import/extensions off, max-nested-callbacks: 5, jsdoc/check-tag-names off). The Jest runner itself isn't wired into this consumer project yet (yarn scripts and ahoy test-js aren't shipped here) - the eslint config arrives ahead of the runtime.

{
"files": ["*.test.js"],
"env": { "jest": true },
"rules": {
"global-require": "off",
"import/extensions": "off",
"max-nested-callbacks": ["warn", 5],
"jsdoc/check-tag-names": "off"
}
}
],
"settings": {
"jsdoc": {
"tagNamePreference": {
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/assign-author.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ jobs:

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