Skip to content

Updated scaffold to Eddy 5.0.0-rc3. - #30

Merged
AlexSkrypnyk merged 1 commit into
1.xfrom
feature/update-eddy-5.0.0-rc3
Oct 20, 2026
Merged

AlexSkrypnyk merged 1 commit into
1.xfrom
feature/update-eddy-5.0.0-rc3

Conversation

@AlexSkrypnyk

Copy link
Copy Markdown
Member

Summary

composer.dev.json now requires drevops/eddy-tooling ~1.0.4 instead of ~1.0.0, and extra.eddy.version reads 5.0.0-rc3. scripts/eddy-tooling builds its vendor/eddy-tooling.json manifest from that constraint, so in an existing checkout the next ahoy command, or make target that runs a tooling command, sees a changed manifest and reinstalls the package first. Today that resolves to 1.0.5.

A checkout built before the rc2 update still holds tooling 1.0.2 or 1.0.3 in vendor/. scripts/eddy-tooling skips the install while the manifest is unchanged and every command the installed package declares is in vendor/bin, and neither release declares eddy-login, so ahoy login and make login stop on a missing vendor/bin/eddy-login until someone runs ahoy reset. Any checkout installed before 1.0.5 also reports a port read from .env as (env) in ahoy info and make info.

Those checkouts now reinstall on their own, so ahoy login and make login work without ahoy reset, and ahoy info and make info label a port from .env as (.env). CI and deploy.yml install the tooling fresh and resolve the newest 1.0.x on every run, which is already 1.0.5 (including the eddy-deploy that no longer force-pushes tags after a branch deployment), so this PR doesn't change them. With this module's installer answers, rc3 renders identically to rc2 apart from composer.dev.json, so module code, the workflows, the wrappers, the tool configs, the docs and scripts/eddy-tooling stay as they are.

Before / After

BEFORE (5.0.0-rc2, checkout built before the rc2 update)

composer.dev.json   drevops/eddy-tooling ~1.0.0
vendor/             drevops/eddy-tooling 1.0.3, no eddy-login

ahoy login ──▶ scripts/eddy-tooling
               └─ manifest unchanged, every 1.0.3 command present ──▶ skip
           ──▶ vendor/bin/eddy-login ──▶ not found
               └─ workaround: ahoy reset, then ahoy build

ahoy info  ──▶ Webserver port: 8004 (env)


AFTER (5.0.0-rc3)

composer.dev.json   drevops/eddy-tooling ~1.0.4

ahoy login ──▶ scripts/eddy-tooling
               └─ manifest changed ──▶ reinstall ──▶ 1.0.5
           ──▶ vendor/bin/eddy-login ──▶ prints the one-time link

ahoy info  ──▶ Webserver port: 8004 (.env)

Changes

Tooling constraint

  • composer.dev.json: drevops/eddy-tooling goes from ~1.0.0 to ~1.0.4, and extra.eddy.version from 5.0.0-rc2 to 5.0.0-rc3.

Merge decisions

  • The rc2 and rc3 renders with this module's answers (Drupal 10,11,12, ahoy,makefile, PHPCS, PHPStan, Rector, Twig CS Fixer, CSpell, PHPUnit and Renovate) differ only in composer.dev.json, and the change applied with no conflicts.
  • renovate.json keeps its npm manager, rules and lock file maintenance. rc3 drops them only when no Node tool is selected, and CSpell counts as one.
  • scripts/eddy-tooling already matches rc3's copy, and package-lock.json keeps the project's copy because package.json doesn't change.
  • The rest of rc3 lands outside the template: the eddy-deploy, eddy-info and Functional test deprecation fixes ship in drevops/eddy-tooling 1.0.5, and the docs rewrite covers Eddy's own documentation site.

How this was tested

  • ahoy build on Drupal 11.4.10 and PHP 8.4.17: scripts/eddy-tooling printed Installing drevops/eddy-tooling ~1.0.4. over the existing install and resolved 1.0.5.
  • ahoy lint: PHPCS, PHPStan, Rector, Twig CS Fixer and CSpell are clean.
  • ahoy test: OK (40 tests, 72 assertions).
  • ahoy login prints a one-time link that signs in as admin. The homepage, /admin/reports/status and /admin/modules load with no page or console errors, and Deploy Steps shows as installed.
  • ahoy info reports Webserver port: 8004 (.env).
  • Drupal 10 and 12 are covered by the CI matrix only. Drupal 12 needs PHP 8.5, and the local PHP is 8.4.

@codecov-commenter

codecov-commenter commented Oct 20, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 97.36%. Comparing base (c2de681) to head (5b84b1e).

Additional details and impacted files
@@           Coverage Diff           @@
##              1.x      #30   +/-   ##
=======================================
  Coverage   97.36%   97.36%           
=======================================
  Files          11       11           
  Lines          76       76           
=======================================
  Hits           74       74           
  Misses          2        2           

☔ 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.

@AlexSkrypnyk
AlexSkrypnyk merged commit 4e95464 into 1.x Oct 20, 2026
14 checks passed
@AlexSkrypnyk
AlexSkrypnyk deleted the feature/update-eddy-5.0.0-rc3 branch October 20, 2026 10:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants