Repository navigation
Forward-ported 70 commits from 'main' onto '2.x'. - #3233
Merged
Merged
Conversation
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit c56c751)
Forward-ported from main 367929b. Only the constraint carries over: the cache key bump belongs to main's 'VORTEX_DB_IMAGE_BASE' change and the lock files are refreshed separately on 2.x.
Forward-ported from main 2bf1dad, applied to '.vortex/cli/src/Utils/FileManager.php'.
(cherry picked from commit 73e0a8e)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 07d8658)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 3e61111)
…ription. Forward-ported from main 6edbf26.
Forward-ported from main 1c1981b, applied to the 'browser' service.
Forward-ported from main 5666568.
Forward-ported from main ccec814. The Rector skips it added are already on 2.x, so only the 'composer.json' and documentation changes carry over.
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit bdf1646)
…lags in the maintenance '.ahoy.yml'. Forward-ported the '.vortex/.ahoy.yml' part of main efa94ff. The installer, Bash tooling and BATS parts of that commit target subsystems that 2.x replaced.
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 9aaee68)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit c872225)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 5834213)
Forward-ported from main d84d08b, applied to every 2.x workflow that pins these actions.
Forward-ported from main 33ff9e5, applied to every 2.x workflow that pins the action.
Forward-ported from main 0c55c07.
Forward-ported from main 29967b2, including its Drupal core '~11.4.8' bump.
Forward-ported from main 10e4aef. The 'upload-sarif' pins are not carried over because 2.x has no SARIF upload steps.
Forward-ported from main 5614bc8, applied to the renamed 2.x Docker Compose services.
Forward-ported from main 7a07413.
Forward-ported from main 837439b.
Forward-ported from main 7369cb2.
This comment has been minimized.
This comment has been minimized.
2 similar comments
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
2 similar comments
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
AlexSkrypnyk
force-pushed
the
feature/propagate-main-20261025
branch
from
October 26, 2026 03:10
4bfdb0f to
eedbde1
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
2 similar comments
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
2 similar comments
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
AlexSkrypnyk
force-pushed
the
feature/propagate-main-20261025
branch
from
October 26, 2026 04:34
a75f76a to
eedbde1
Compare
|
Code coverage (threshold: 90%) Per-class coverage |
This comment has been minimized.
This comment has been minimized.
2 similar comments
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
1 similar comment
Member
Author
|
Code coverage (threshold: 90%) Per-class coverage |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Scope
First half of the
main->2.xforward-port: the 70 commits that landed onmainbetween 2026-08-31 and 2026-10-23 and have a clear, decision-free equivalent on2.x. The second half (the 9 decisions, the docs passes and the dependency refresh) is in #3236, which also targets2.xand is rebased onto it once this PR is merged. The two were split so each stays rebase-mergeable.2.xhas moved a long way frommain(the installer is the CLI in.vortex/cli, tooling is PHP, provisioning is deploy steps, provider settings live indrevops/environment-detector, services have vendor-agnostic names), so most of these are adaptations rather than straight cherry-picks. Each port is its own commit: cherry-picks carry the(cherry picked from commit ...)trailer, adaptations name the source commit in the body.Known red check:
Vortex - Test docsThis required check fails on this PR for a reason outside the diff.
vortex-test-docs.ymlruns onworkflow_run, so GitHub usesmain's copy of the workflow. That copy has aCheck prose stylestep (yarn run lint-prose), and2.xgainslint-proseonly in the follow-up PR, so here it fails witherror Command "lint-prose" not found.Every other check is green. The plan is to merge this PR with an admin override of that one check; the follow-up PR brings Vale and turns it green.Applied
vortex-test-cli.ymlandvortex-test-tooling.yml), Drupal core to~11.4.11, PHP package constraints, uselagoon images to 26.10.0, Selenium Chromium 155 onbrowser, Renovate 44.176.2, platform PHP 8.4.27.sdc_develexcluded from config export ([#3082] Excluded 'sdc_devel' from exported configuration like the other development modules. #3088).auth.jsonkept out of the image ([#3078] Kept 'auth.json' out of the container build context and image. #3084).inline_failures(Replaced 'drevops/behat-format-progress-fail' with the Behat core 'inline_failures' option and updated 'behat/behat' to '^3.34.0'. #3181).=== '1'guard form across the settings includes ([#3112] Settled one environment variable guard form across the Drupal settings includes. #3122).cliandappserver(Added custom PHP ini support to the 'cli' and 'php' containers and disabled session upload progress. #3222, Asserted the 'php' container PHP settings through 'php-fpm -i' in the Docker Compose workflow test. #3223).CLAMAV_test isolation ([#3230] Cleared inherited 'CLAMAV_' variables in the settings tests. #3231).--source(Updated 'git-artifact' to '1.8.0' and passed the source directory with its '--source' option. #3172, Updated 'git-artifact' to 1.9.0. #3224).vortex-fetch-dbsource validation andnone([#3208] Made 'vortex-fetch-db' fail on an unknown 'VORTEX_FETCH_DB_SOURCE' instead of reporting success. #3212).vortex-doctoradvice andwebserverafterappserver([#3169] Made 'nginx' start after 'php' and corrected the SSH agent recovery advice in 'vortex-doctor'. #3170)..vortex/skillsas thevortexplugin (Moved maintenance skills to '.vortex/skills' and registered them as the 'vortex' Claude Code plugin. #3204), template-level parts of 1.42.0 and the package refresh (Updated for the release 1.42.0 'Halo'. #3213, Updated all packages to their latest versions and all container images to their latest tags. #3227).Skipped
6f3508bf8([#3081] Derived the host with 'parse_url()' when building trusted host patterns. #3087): provider files gone on 2.x; the same bug lives upstream indrevops/environment-detector.94e4e4b6b([#3107] Replaced the drifted script snippet in '.vortex/CLAUDE.md' with a pointer to 'script-boilerplate.sh'. #3117): 2.x documents its own PHP tooling pattern.d131ccbad([#3106] Added the missing marker space in negative BATS step assertions. #3119): BATS only; 2.x has no BATS suite.9b38d2840([#3113] Reconciled the drifted duplicate helpers across the shipped tooling scripts. #3124): Bash helpers; the PHP tooling shareshelpers.php.82c16503d([#3114] Derived the handler processing order and prompt count in 'PromptManager'. #3125): noPromptManageron 2.x.d2e6faf06(Updated 'drevops/ci-runner' to '26.10.0'. #3173): 2.x doesn't usedrevops/ci-runner.Worth a look
DRUPAL_SHIELD_DISABLEDaccept only1.drupal/fast_404is installed.Snapshots and gates
ahoy update-snapshotsran after the last port.vortex-test-workflowmatrix.ahoy lint,.vortex/cli(1687 tests) and.vortex/tooling(840 tests).