Forward-ported nine main commits onto 2.x: dependency bumps, CI permissions, and ENVIRONMENT_TYPE. - #2805
Merged
Merged
Conversation
| datasource | package | from | to | | ----------- | ------------------------ | ------ | ------ | | github-tags | zizmorcore/zizmor-action | v0.5.7 | v0.6.0 | (cherry picked from commit b642c10)
| datasource | package | from | to | | ---------- | ----------------------------- | ------ | ------ | | packagist | drupal/core-composer-scaffold | 11.4.3 | 11.4.4 | | packagist | drupal/core-recommended | 11.4.3 | 11.4.4 | (cherry picked from commit 3054b60)
…gh pr view'. Forward-ported from main bf3e2e7.
) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit c2ed568)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 9bdb2ec)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> (cherry picked from commit 9c7008c)
Forward-ported from main 240cd28.
…pdates job. Forward-ported from main 0cbb0f8.
…ntime. Forward-ported from main 1d321be. The 'SettingsTestCase' allowlist already covers 'ENVIRONMENT_TYPE' on 2.x through the broader 'ENVIRONMENT_' prefix, so only the container-runtime forwarding and its subtest are applied here.
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository UI Review profile: ASSERTIVE Plan: Pro Plus Run ID: ⛔ Files ignored due to path filters (71)
📒 Files selected for processing (16)
WalkthroughThe PR forwards ChangesEnvironment forwarding and validation
Container and platform updates
Estimated code review effort: 2 (Simple) | ~10 minutes Possibly related issues
Possibly related PRs
Suggested labels: Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Comment |
|
Code coverage (threshold: 90%) Per-class coverage |
This comment has been minimized.
This comment has been minimized.
1 similar comment
Member
Author
|
Code coverage (threshold: 90%) Per-class coverage |
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## 2.x #2805 +/- ##
=======================================
Coverage 87.97% 87.97%
=======================================
Files 98 98
Lines 5332 5332
Branches 3 3
=======================================
Hits 4691 4691
Misses 641 641 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
|
📖 Documentation preview for this pull request has been deployed to Netlify: https://6a58970802fdc300fde80e73--vortex-docs.netlify.app This preview is rebuilt on every commit and is not the production documentation site. |
AlexSkrypnyk
added
the
Needs review
1 task
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.
Scope
Forward-ports nine commits from
mainonto2.x, keeping the development branch current with the 1.x release line. One furthermaincommit (the docs marketing-diagram hero) is intentionally deferred - see Skipped.Applied
Each port is its own commit, 1:1 with its
mainsource: cherry-picks carry a(cherry picked from ...)provenance line, and adaptations name the source commit in their body.b642c102Updatezizmorcore/zizmor-actionto v0.6.0 - clean cherry-pick (2.x was at v0.5.7).3054b600Update Drupal core to~11.4.4- cherry-pick; conflict resolved to keep 2.x'sdrupal/deploy_stepsrequirement while bumping core from~11.4.0.bf3e2e7bAddedpull-requests: readto the CI deploy job forgh pr view- adapted.build-test-deploy.ymlhas diverged on 2.x (thedrevops/ci-runnercontainer was replaced with the CI providers' base images), so only the deploy-jobpermissionsblock was added, at the position 2.x's structure expects it. Main's incidental stripping of comments from unrelated permission blocks was dropped as out of scope.c2ed5681Update container images to v26.7.0 - clean cherry-pick of the three.docker/*.dockerfileimage tags (2.x was at 26.6.0).9bdb2ec2Updateuselagoon/mysql-8.4to v26.7.0 - clean cherry-pick (docker-compose.yml).9c7008c3Updateuselagoon/valkey-8to v26.7.0 - cherry-pick; conflict resolved to keep 2.x's renamedcacheservice (SERVICE_CACHEfence) while bumping the image tag.240cd283Added the Drupal logo to the Drupal version shield - swapped the badge inREADME.dist.mdand added the badge toREADME.md.0cbb0f88Addedissues: writeto the Renovate dependency-updates job - added the permission to the job'spermissionsblock.1d321bedCoveredENVIRONMENT_TYPEin the container runtime - adapted. Applied the.ahoy.ymlcli-forwarding grep, thedocker-compose.ymlpass-through, and the ahoy-cli forwarding subtest. TheSettingsTestCaseallowlist hunk was skipped because 2.x already coversENVIRONMENT_TYPEthrough the broaderENVIRONMENT_prefix introduced with the environment-detector work.Skipped
96069a6cReplaced the docs hero with a marketing diagram and narrowed demo videos to 80 columns - deferred.architecture.mdxhas diverged on 2.x, and the demo-video*.json/*.png/*.svgassets are per-branch terminal recordings; taking main's would ship 1.x demo output as 2.x documentation. Applying it correctly requires a full demo-video re-render on 2.x (Docker plus a site build), which is docs-subsystem work rather than a mechanical forward-port. It stays flagged for a future run.Snapshots
ahoy update-snapshotswas run from.vortex/in the foreground. It regenerated both the DockerComposeTest fixtures and the installer fixtures (143 datasets, 56 updated, 0 failed) and committed them. Container-image and core-version bumps produced no fixture churn because those versions are normalized in the fixtures. No template files were deleted, so noSutTrait.phpfollow-up is outstanding.Gates
Local
.vortexlints pass:lint-ci(the.circlecimirror is in sync),lint-tests(phpcs, phpstan, rector),lint-dockerfiles, andlint-markdown. The rootahoy lint/test-unitare consumer gates that do not apply to the unbuilt template. The full template-test matrix (vortex-test-workflow) runs in CI and remains the source of truth.Before / After
Summary by CodeRabbit
New Features
Bug Fixes
Chores