Skip to content

Forward-ported 70 commits from 'main' onto '2.x'. - #3233

Merged
AlexSkrypnyk merged 71 commits into
2.xfrom
feature/propagate-main-20261025
Oct 26, 2026
Merged

AlexSkrypnyk merged 71 commits into
2.xfrom
feature/propagate-main-20261025

Conversation

@AlexSkrypnyk

@AlexSkrypnyk AlexSkrypnyk commented Oct 25, 2026 •

Copy link
Copy Markdown
Member

Scope

First half of the main -> 2.x forward-port: the 70 commits that landed on main between 2026-08-31 and 2026-10-23 and have a clear, decision-free equivalent on 2.x. The second half (the 9 decisions, the docs passes and the dependency refresh) is in #3236, which also targets 2.x and is rebased onto it once this PR is merged. The two were split so each stays rebase-mergeable.

2.x has moved a long way from main (the installer is the CLI in .vortex/cli, tooling is PHP, provisioning is deploy steps, provider settings live in drevops/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 docs

This required check fails on this PR for a reason outside the diff. vortex-test-docs.yml runs on workflow_run, so GitHub uses main's copy of the workflow. That copy has a Check prose style step (yarn run lint-prose), and 2.x gains lint-prose only in the follow-up PR, so here it fails with error 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

Skipped

Worth a look

  • Stage reroutes email.
  • Flags such as DRUPAL_SHIELD_DISABLED accept only 1.
  • Fast 404 is active wherever drupal/fast_404 is installed.

Snapshots and gates

  • ahoy update-snapshots ran after the last port.
  • This exact head passed every CI check except the docs check explained above, including the full vortex-test-workflow matrix.
  • Locally: ahoy lint, .vortex/cli (1687 tests) and .vortex/tooling (840 tests).

renovate Bot and others added 30 commits October 25, 2026 23:38
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)
…rule and removed the redundant 'eslint.config.mjs' section. (#3083)

(cherry picked from commit 7be04c0)
…er development modules. (#3088)

(cherry picked from commit 9f7de2a)
Forward-ported from main 1c1981b, applied to the 'browser' service.
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 29967b2, including its Drupal core '~11.4.8' bump.
…her container images. (#3164)

(cherry picked from commit 9bea17d)
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.
@AlexSkrypnyk

This comment has been minimized.

2 similar comments
@AlexSkrypnyk

This comment has been minimized.

@AlexSkrypnyk

This comment has been minimized.

@AlexSkrypnyk AlexSkrypnyk changed the title Forward-ported 'main' onto '2.x' up to 1.42.0 and resolved the deferred decisions. Forward-ported 'main' onto '2.x' up to 1.42.0, resolved the deferred decisions and refreshed dependencies. Oct 26, 2026
@github-actions

This comment has been minimized.

@AlexSkrypnyk

This comment has been minimized.

2 similar comments
@AlexSkrypnyk

This comment has been minimized.

@AlexSkrypnyk

This comment has been minimized.

@AlexSkrypnyk
AlexSkrypnyk force-pushed the feature/propagate-main-20261025 branch from 4bfdb0f to eedbde1 Compare October 26, 2026 03:10
@AlexSkrypnyk AlexSkrypnyk changed the title Forward-ported 'main' onto '2.x' up to 1.42.0, resolved the deferred decisions and refreshed dependencies. Forward-ported 70 commits from 'main' onto '2.x'. Oct 26, 2026
@github-actions

This comment has been minimized.

@AlexSkrypnyk

This comment has been minimized.

2 similar comments
@AlexSkrypnyk

This comment has been minimized.

@AlexSkrypnyk

This comment has been minimized.

@github-actions

This comment has been minimized.

@AlexSkrypnyk

This comment has been minimized.

2 similar comments
@AlexSkrypnyk

This comment has been minimized.

@AlexSkrypnyk

This comment has been minimized.

@github-actions

Copy link
Copy Markdown

Code coverage (threshold: 90%)

  Classes: 100.00% (1/1)
  Methods: 100.00% (2/2)
  Lines:   100.00% (171/171)
Per-class coverage
Drupal\ys_demo\Plugin\Block\CounterBlock
  Methods: 100.00% ( 2/ 2)   Lines: 100.00% ( 10/ 10)

@AlexSkrypnyk

This comment has been minimized.

2 similar comments
@AlexSkrypnyk

This comment has been minimized.

@AlexSkrypnyk

This comment has been minimized.

@AlexSkrypnyk
AlexSkrypnyk merged commit ae92da1 into 2.x Oct 26, 2026
78 of 80 checks passed
@AlexSkrypnyk
AlexSkrypnyk deleted the feature/propagate-main-20261025 branch October 26, 2026 04:52
@github-project-automation github-project-automation Bot moved this from BACKLOG to Release queue in Vortex 1.x Oct 26, 2026
@AlexSkrypnyk

This comment has been minimized.

1 similar comment
@AlexSkrypnyk

Copy link
Copy Markdown
Member Author

Code coverage (threshold: 90%)

  Classes: 100.00% (1/1)
  Methods: 100.00% (2/2)
  Lines:   100.00% (171/171)
Per-class coverage
Drupal\ys_demo\Plugin\Block\CounterBlock
  Methods: 100.00% ( 2/ 2)   Lines: 100.00% ( 10/ 10)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A1 Board worker 1 Needs review Pull request needs a review from assigned developers

Projects

Status: Release queue

Development

Successfully merging this pull request may close these issues.

1 participant