Forward-ported 15 commits from 'main' onto '2.x'. - #2877
Merged
Conversation
| datasource | package | from | to | | ---------- | ------------------ | ------ | ------ | | docker | uselagoon/valkey-8 | 26.7.0 | 26.8.0 | (cherry picked from commit 7597541)
| datasource | package | from | to | | ---------- | ------------------- | ------ | ------ | | docker | uselagoon/mysql-8.4 | 26.7.0 | 26.8.0 | (cherry picked from commit 3ca7c57)
Forward-ported from main f941579.
) Co-authored-by: Renovate Self Hosted <deploy+renovatebot@drevops.com> (cherry picked from commit f5d9960)
… the standard progress helpers. Forward-ported from main fa098d0.
… deselected. Forward-ported from main ece8160.
Forward-ported from main ab2ae94.
Forward-ported from main dc399b6.
| datasource | package | from | to | | ----------- | ------------------------------- | -------- | ------- | | github-tags | release-drafter/release-drafter | v7.6.0 | v7.7.0 | | github-tags | renovatebot/github-action | v46.1.21 | v46.2.0 | (cherry picked from commit d41596a)
…fied per-line ones. Forward-ported from main c98f69d.
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 6816fc3)
Forward-ported from main d4e6245.
…mentation page is checked. Forward-ported from main 8bd16d3.
|
Warning Review limit reachedYou’ve reached a temporary PR review limit under our Fair Usage Limits Policy. Next review available in: 12 minutes Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available. How can I continue?After more reviews become available, a review can be triggered using the To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews. How do review limits work?CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability. For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window. Please refer docs for additional details. Review details⚙️ Run configurationConfiguration used: Repository UI Review profile: ASSERTIVE Plan: Pro Plus Run ID: ⛔ Files ignored due to path filters (1)
📒 Files selected for processing (129)
Comment |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
1 similar comment
This comment has been minimized.
This comment has been minimized.
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 2.x #2877 +/- ##
==========================================
+ Coverage 88.11% 88.15% +0.04%
==========================================
Files 98 98
Lines 5392 5412 +20
Branches 3 3
==========================================
+ Hits 4751 4771 +20
Misses 641 641 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
AlexSkrypnyk
added
the
Needs review
AlexSkrypnyk
enabled auto-merge (rebase)
July 31, 2026 06:41
AlexSkrypnyk
disabled auto-merge
July 31, 2026 09:02
AlexSkrypnyk
changed the title
|
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.
Member
Author
|
Code coverage (threshold: 90%) Per-class coverage |
|
📖 Documentation preview for this pull request has been deployed to Netlify: https://6a6c76e40cfcbecac79baedc--vortex-docs.netlify.app This preview is rebuilt on every commit and is not the production documentation site. |
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
1 participant
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.
Summary
Forward-ports 15 commits from
mainonto2.x, covering container image, GitHub Actions and PHP dependency bumps, a documentation glob-quoting fix that restores linting and spellchecking coverage to 74 pages, Hadolint version pinning with justified per-line ignores, the multi-version wiring that lets oneVortex - Test docsdefinition serve both majors, and CLI installer changes that makedclint/hadolintoptional tools and suppress Composer noise during initial tooling install. Seven commits cherry-picked cleanly, three required conflict resolution against2.x's diverged CI configuration and tooling scripts, and five were hand-adapted to2.x's relocated CLI structure (.vortex/cli/rather than.vortex/installer/). Ten furthermaincommits were evaluated and deliberately skipped, either because2.xalready carries the change under a different commit, the change is superseded by2.x's own architecture, or it is owned by tooling (Renovate, BATS) that does not exist on2.x. Full rationale for every applied and skipped commit is below.Changes
Applied (15)
Clean cherry-picks:
3ca7c572Updateuselagoon/mysql-8.4to v26.8.0 -2.xwas at 26.7.0.f5d99606Update container images to v26.8.0 -.docker/clamav, database and solr were at 26.7.0.d41596acUpdate GitHub Actions - release-drafter v7.6.0 to v7.7.0, renovate v46.1.21 to v46.2.0.6816fc3bUpdaterhysd/actionlintto v1.7.12 -2.xwas at 1.7.10. Worth noting this pin was unreachable by Renovate untilc98f69d7below landed itscustomManager, so it could not have been picked up automatically.8bd16d31Quoted thecontent/**/*.mdxlint and spellcheck globs -2.xcarried the identical unquoted globs, sosh(which has noglobstar) collapsed**to*and every page deeper than one level belowcontent/went unchecked while both tools still exited 0. Brings the newlint-globs.test.jsregression test plus the markdownlint and cspell fixes the wider glob surfaces. Docs linting now covers 74 pages.7840b3c4Update PHP packages except core -search_api_solr^4.3.13 to ^4.4.0,phpstan/phpstan^2.2.6 to ^2.2.7,rector/rector^2.5.8 to ^2.5.9.2.xsat on exactly the pre-image constraints, so this applied without conflict.Cherry-picks with conflict resolution:
759754103Updateuselagoon/valkey-8to v26.8.0 - resolved to keep2.x's renamedcacheservice (SERVICE_CACHE).c98f69d7Pinned Hadolint to v2.15.0 and replaced its global ignores with justified per-line ones. This is the highest-value item in the batch:2.xinvokedhadolint/hadolintuntagged in three places (.circleci/config.yml,.github/workflows/build-test-deploy.yml,.vortex/tests/lint.dockerfiles.sh), so it resolved tolatestand an upstream release could break the default branch on a commit that changed nothing. It also adds therenovate.jsoncustomManagerthat tracksdocker run <image>:<tag>pins, which2.xlacked entirely - without it these pins are invisible to Renovate and silently rot.d4e62457Pinned the seed script,asciinemaandsharp-cliversions - replacesreleases/latest/downloadwith a tagged URL plus asha256sum --check, pinsSEED_URLto the 26.7.0 release with a checksum, and movessharp-clifrom a globalnpm i -gintopackage.json. Retargeted onto2.x'svortex-test-cli.yml(the workflowmainstill callsvortex-test-installer.yml) and kept2.x'supdate-videos.php cli-installtarget.Hand-adapted to 2.x's structure:
f9415793Madedclintandhadolintoptional development tools - reapplied against.vortex/cli/(2.xrelocated the installer out of.vortex/installer/), adding theDCLINT/HADOLINTconstants, defaults, tool definitions andTOOL_DCLINT/TOOL_HADOLINTfences in both CI providers. Also fixes a live typo on2.x:getToolDefinitions('goups')inTools.php.fa098d09Suppressed Composer output of the initial tooling install - added the progress helpers and thecomposer_runwrapper onto2.x's divergedscripts/vortex-tooling.sh, preserving itscompgenguard and itsVORTEX_DEV2.xtooling marker check. The upstream test half was dropped becauseToolingBootstrapTest.phpdoes not exist on2.x.ece81600Removed thepagecontent model when the demo and search modules are deselected -2.x's.gitignorecarried!recipes/pageunfenced, so the recipe was retained even with both modules deselected. Adds theCONTENT_MODELfence and the guard in.vortex/cli'sCustomModules.php.ab2ae942Added the visual regression report to the GitHub Actions run summary - source-only port; also fixes thepages_changedjq expression.dc399b62Added opt-in for visual regression on non-PR deployments - functional on2.xbecausevortex-notify-diffyalready sendsbranchin itsclient_payload.9a888310TriggeredVortex - Test docsfrom both per-major test workflows. Only the major-agnostic hunks were taken: the both-workflow trigger, theBINARY_ARTIFACT/BINARY_FILEenv vars, therun_id-pinned artifact download, theBINARY_FILEcopy step and the zizmor comment.main's other-major build leg was deliberately not taken - that leg is correctly inverted per branch (on2.xthe other major is1.xand builds the installer, not the CLI), so importingmain's version would have broken it. Beyond the multi-version wiring this carries a real defect2.xalso had: downloading the artifact byworkflow:name resolves to the most recent successful run across all branches rather than the triggering run, so the docs job could publish a binary built from a different commit.Skipped (10)
0140556fgit-artifact 1.7.0 and stale branch cleanup - already present in2.x's PHPvortex-deploy-artifactand its docs.2e855edfUpdate GitHub Actions - already present asf060a79be.8e186fedzizmor-action v0.6.1 -2.xalready at v0.6.1.62235616PHP package updates - Renovate-owned;2.x'scomposer.jsonhas diverged and its own Renovate raises these.94f1da89CI runner disk pressure - already forward-ported asea34080d8.332dc85fLagoon CLI error on failed deploy - already forward-ported as9ce3afbe3.ebe25197BATS credential isolation - test-only; the BATS harness does not exist on2.x, where tooling tests are PHPUnit.10b840e1Anchored environment name matching in provision scripts -scripts/provision-NN-*.shwere removed on2.xand its deploy steps compare with an exact$this->environment() === 'prod', so the unanchored-substring defect cannot occur.e94fde1eSplit provision example scripts - already realised by2.x's deploy-step classes.b04386abDocs workflows building the v2 binary - amain-side fix for building2.x's CLI;2.xalready carries the mirror-image.Snapshots
ahoy update-snapshotswas run twice. The first pass regenerated and committed 43 fixtures with 0 failures, including newtools_no_dclint,tools_no_hadolint,tools_no_docker_linters(plus CircleCI variants) andcustom_modules_none/recipes/pagescenarios that confirm the two installer ports work end to end. The second pass, after the final two commits, reportedUpdated: 0, Failed: 0across all 149 scenarios - correct, because the fixtures mask dependency versions as__VERSION__andvortex-test-docs.ymlis a maintenance workflow that is not part of the scaffolded fixture set. No template file was deleted, so noSutTrait.phpfollow-up is outstanding.Gates
.vortexlint passed (phpcs, phpstan, rector acrosscli/tests/tooling, shellcheck, hadolint, markdownlint, cspell, CI config check). Docs tests passed (10 suites, 191 tests). CLI handler tests passed (422 tests, 1321 assertions). The full template-test matrix is CI's job and runs on this PR.Screenshots
N/A
Before / After