Skip to content

Forward-ported four commits from 'main' onto '2.x'.#2791

Merged
AlexSkrypnyk merged 5 commits into
2.xfrom
feature/propagate-main-20260715
Jul 15, 2026
Merged

Forward-ported four commits from 'main' onto '2.x'.#2791
AlexSkrypnyk merged 5 commits into
2.xfrom
feature/propagate-main-20260715

Conversation

@AlexSkrypnyk

Copy link
Copy Markdown
Member

Scope

Forward-ports 4 commits from main onto 2.x, selected from 66 candidates after analysing each against the current state of 2.x. The other 62 candidates were already effectively present (most as prior forward-ports), superseded dependency bumps, or main-only release-prep, and were deliberately excluded.

Applied

  • ef25a67e Bumped the CI database cache version to v26.7.1 - adaptation: 2.x was at v26.7.0; the version string was re-set across the three CI files by hand because the cache-key structure has diverged. Renovate does not manage this manual cache-bust value.
  • 7957832457 Added installer selection for Gitleaks secret scanning - adaptation: the Gitleaks CI step and .gitleaks.toml already ship on 2.x, so this adds the CI_GITLEAKS fences around the existing step, the Gitleaks prompt handler, PromptManager wiring, and the four shared test-helpers, reapplied onto 2.x's reshaped installer.
  • 7655131027 Turned .dockerignore, .gitignore and .gitignore.artifact into deny lists - part clean, part adaptation: the three ignore files and the two docs pages (artifact.mdx, git-artifact.mdx) were byte-identical to main's pre-flip state and taken directly; SutTrait.php, the migration functional test, and the new architecture.mdx/docker.mdx sections were reapplied by hand onto 2.x's diverged versions.
  • 3aa2c52a Added installer selection for Twig CS Fixer in the Tools multiselect - part clean, part adaptation: Tools.php and the Tools discovery test were taken directly; the TOOL_TWIG_CS_FIXER CI fences and the two new tools_no_twig/tools_no_twig_circleci process-test scenarios were reapplied by hand (the Tools process test had diverged by the CI job rename).

Skipped (notable)

  • 96069a6c Docs marketing-diagram hero and 80-column demo videos - deferred: architecture.mdx has diverged on 2.x and porting it would force a heavy demo-video re-render.
  • 43b8f98f Excluded installer fixtures from the Zizmor audit - the functional scoping is already present on 2.x (via the v0.5.7 action bump); only a redundant explanatory comment differed.
  • 60 further candidates - already present on 2.x (many as explicit forward-ports), superseded Renovate bumps that 2.x's own Renovate raises independently, or two main-only 1.x release-prep commits.

Snapshots

ahoy update-snapshots was run from .vortex/ in the foreground and committed the regenerated fixtures (143 datasets, 50 updated, 0 failed). A second pass reported 0 changes, confirming stability. No template files were deleted, so no SutTrait.php deletion follow-up is outstanding.

Follow-up

The installer demo video (installer.json, installer.svg, installer.png, installer.gif) is intentionally NOT regenerated in this PR, even though the prompt flow changed (new Gitleaks prompt, TOTAL_RESPONSES 35 to 36, Twig in the Tools multiselect). It is not a CI gate and the release process regenerates all six videos; run ahoy update-videos installer if the docs need to match sooner.

Gates

Local .vortex lint passed for every touched area: lint-installer, lint-tests, lint-ci, and lint-docs. The full vortex-test-workflow template-test matrix runs in CI and is the final source of truth.

Before / After

Installer CI prompts        BEFORE (2.x)         AFTER (this PR)
────────────────────        ────────────         ──────────────
  CI provider               shown                shown
  Visual regression         shown                shown
  Gitleaks secret scan      absent               shown   <- new toggle
  Tools multiselect         phpcs .. stylelint   phpcs .. stylelint
                                                 + Twig CS Fixer  <- new

Ignore-file model           BEFORE (2.x)         AFTER (this PR)
─────────────────           ────────────         ──────────────
  .dockerignore             allow-list           deny-list
  .gitignore                (ignore '*', then    (ignore only the
  .gitignore.artifact        re-include paths)    listed paths)

CI database cache version   v26.7.0        ->     v26.7.1

@github-actions

Copy link
Copy Markdown

Code coverage (threshold: 90%)

  Classes: 100.00% (1/1)
  Methods: 100.00% (2/2)
  Lines:   100.00% (153/153)
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.

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% (153/153)
Per-class coverage
Drupal\ys_demo\Plugin\Block\CounterBlock
  Methods: 100.00% ( 2/ 2)   Lines: 100.00% ( 10/ 10)

@codecov

codecov Bot commented Jul 15, 2026

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 87.09677% with 4 lines in your changes missing coverage. Please review.
✅ Project coverage is 87.97%. Comparing base (18d5642) to head (e62a62e).

Files with missing lines Patch % Lines
...Unit/Handlers/AbstractHandlerDiscoveryTestCase.php 0.00% 4 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##              2.x    #2791      +/-   ##
==========================================
+ Coverage   87.96%   87.97%   +0.01%     
==========================================
  Files          97       98       +1     
  Lines        5302     5332      +30     
  Branches        3        3              
==========================================
+ Hits         4664     4691      +27     
- Misses        638      641       +3     

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions

Copy link
Copy Markdown

📖 Documentation preview for this pull request has been deployed to Netlify:

https://6a573709c7add6ff6073d300--vortex-docs.netlify.app

This preview is rebuilt on every commit and is not the production documentation site.

@AlexSkrypnyk AlexSkrypnyk added the Needs review Pull request needs a review from assigned developers label Jul 15, 2026
@AlexSkrypnyk AlexSkrypnyk merged commit 931eab7 into 2.x Jul 15, 2026
37 checks passed
@AlexSkrypnyk AlexSkrypnyk deleted the feature/propagate-main-20260715 branch July 15, 2026 08:18
@github-project-automation github-project-automation Bot moved this from BACKLOG to Release queue in Vortex 1.x Jul 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

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