- Issue created by @jonathan1055
- π¬π§United Kingdom jonathan1055
We currently have a mixture of lower case and differently capitalized case for software names throughout the documentation pages. It would be good to have consistent capitalisation and the following are what I think should be used, according to the sites linked:
Mixed capitalization
ESLint - https://eslint.org
CSpell - https://cspell.org
PHPStan - https://phpstan.org
PHPUnit - https://phpunit.de
MkDocs - https://squidfunk.github.io/mkdocs-materialOrdinary single letter capital
Composer - https://getcomposer.org/
Stylelint - https://stylelint.io
Nightwatch https://nightwatchjs.org/All capitals or all lower case (but not mixed)
PHPCS or phpcs - https://github.com/PHPCSStandards/PHP_CodeSniffer
The actual job names in .main.yml cannot be changed. These are all in lower case except for the 'PHP' in the 'max PHP version' variants.
- π¬π§United Kingdom jonathan1055
Thanks. I will search out the incorrect ones and fix them.
- π¬π§United Kingdom jonathan1055
Added note to the summary about the original https://www.drupal.org/docs/develop/git/using-gitlab-to-contribute-to-dr... β
- π¬π§United Kingdom jonathan1055
Following up #3 and #4, I have just pushed changes to fix the mixed capitalization for ESLint, CSpell, PHPStan and PHPUnit. (MkDocs was already correct). I will do the changes for the others next.
- πͺπΈSpain fjgarlin
Thanks for all these fixes. I'll check the full MR once ready, but so far it's looking great!
- π¬π§United Kingdom jonathan1055
I have added the hint for ckeditor - from end of this thread https://drupal.slack.com/archives/CGKLP028K/p1716902409940869
There's quite a lot here, so this is ready for review. I won't add any more new changes now, so you can review this ready for merging.
- πͺπΈSpain fjgarlin
I made a really minor fix. Running pipelines https://git.drupalcode.org/project/gitlab_templates/-/pipelines/326141
If all green I'll go ahead and merge. Thanks for making sure the languages stays consistent all throughout the documentation! -
fjgarlin β
committed 391dcc33 on main authored by
jonathan1055 β
Issue #3473000 by jonathan1055, fjgarlin: Documentation pages
-
fjgarlin β
committed 391dcc33 on main authored by
jonathan1055 β
- π¬π§United Kingdom jonathan1055
Thank you for noticing that and fixing it.
There are more docs changes, as I have not reviewed all the pages yest, some are still the originals. Before two weeks elapses I may open a new MR here for the next changes, before the issue closes.
- π¬π§United Kingdom jonathan1055
The first commit in MR281- docs part 6 is a re-write of the ESLint page by @ptmkenny from this slack thread
- πͺπΈSpain fjgarlin
Adding this from comment #12 on π¬ Disabling OPT_IN_TEST_CURRENT not working Active from @liam-morland
--
It would be very helpful if the Templates behavior in contrib modules page included a table to help people select what template version to use, something like this:
Also, the
.gitlab-ci.yml
template includes the text "For information on alternative values for 'ref'". This isn't very helpful if you don't know what can be configured withref
. I suggest changing this text to something like "You can choose what version of Drupal core to test on by setting the value of 'ref' To learn about the options, see https://project.pages.drupalcode.org/gitlab_templates/info/templates-ver...".--
Fully agree on the second part. As for the first part, I agree that we can add some extra info or even an informative table, but as we only have one branch, it would be misleading to have Drupal 10 linked to 1.5.x-latest, because that's never going to get any additional changes or bug, it is just a tag.
I'd put something like this instead:
The templates are designed to keep up with Drupal versions. "Current" represents the recommended version of Drupal at that moment in time, so if new versions are released, "current" will change, whether it is a new minor or a new major (less common). With "current", the concept of "next" or "previous", whether it is "minor" or "major", will also shift.
For example, tag 1.6.0 made the switch for "current" to be Drupal 11. Before that, "current" was Drupal 10.
- π¬π§United Kingdom jonathan1055
I noticed that the description of the second commit list was wrong, it said "What commits are in main but not yet in a tagged release?" but it was actually showing "What commits are in main but not yet in default" so I fixed the description. We don't often have a difference, because most times the default-ref is updated when a new tagged release is made. But at the current moment we have 1.6.10 but 'default' is still at 1.6.9. That's fine. I added a third commit list link, which shows what the second link was meant to show, namely what is in 'main' but not in a tagged release.
I changed the format for the new link, and could do the same for the other two if this is more readable. Not sure yet. Here's what the updated page looks like
-
fjgarlin β
committed e718a036 on main authored by
jonathan1055 β
Issue #3473000 by jonathan1055, fjgarlin: Documentation pages
-
fjgarlin β
committed e718a036 on main authored by
jonathan1055 β
- πͺπΈSpain fjgarlin
I'm going to merge the current MR as it's a good round of improvements. As usual, we can open new ones. Great improvements!
- π¬π§United Kingdom jonathan1055
Thanks for merging. I forgot to comment that one page had a incorrect internal link, which I fixed. The path needs to be relative to the current page not the document top-level. I guess we just have to check these things manually, as they are not found by any automatic checking.
- πͺπΈSpain fjgarlin
Maybe we can do an internal task to check that. I found this which could be useful: https://github.com/tcort/markdown-link-check
This could be done in a follow-up as this issue is for documentation updates. - π¬π§United Kingdom jonathan1055
Good find. I have opened β¨ Use markdown-link-check to verify .md links Active
Automatically closed - issue fixed for 2 weeks with no activity.
- π¬π§United Kingdom jonathan1055
jonathan1055 β changed the visibility of the branch 3473000-doc-update-5 to hidden.
- π¬π§United Kingdom jonathan1055
jonathan1055 β changed the visibility of the branch 3473000-doc-update-6 to hidden.
- π¬π§United Kingdom jonathan1055
MR319 is ready for review. Given that the allow_failure work is now in 'default-ref' I think it would be good to get this updated document page published.
There is always lots more to update in the docs, I have a long list, but will open new MR when I get on to that, so that 319 can be reviewed and won't be changing.
-
fjgarlin β
committed f21877e9 on main authored by
jonathan1055 β
Issue #3473000 by jonathan1055, fjgarlin: Documentation pages
-
fjgarlin β
committed f21877e9 on main authored by
jonathan1055 β
- πͺπΈSpain fjgarlin
Agree. I've reviewed the changes and they look good, so I've merged MR319.
Marking as Fixed for now, but feel free to create a new MR and change the status of the issue. - π¬π§United Kingdom jonathan1055
Thanks for merging this. Just looked at the real published page and the formatting is not the same as when viewing the updated file in the issue fork (which is the only way I know how to check it when making changes). The numbered list has not been rendered, see attached screen shots.
I'm not sure what is wrong with the source file. Maybe we need to pursue β¨ Use markdown-link-check to verify .md links Active and that may identify incorrect formatting.
- π¬π§United Kingdom jonathan1055
Setting to 'active' ready for next documentation MR.
- πͺπΈSpain fjgarlin
Good catch, so far this https://project.pages.drupalcode.org/gitlab_templates/help/documentation... is the best way I've found to test everything locally as it will look like on the real site, but it's not straight forward and needs some local tools.
-
fjgarlin β
committed 24c52165 on main
#3473000: Space in numbered list.
-
fjgarlin β
committed 24c52165 on main
- π¬π§United Kingdom jonathan1055
jonathan1055 β changed the visibility of the branch 3473000-doc-update-7 to hidden.
- πΊπΈUnited States dww
Coming here from https://drupal.slack.com/archives/CGKLP028K/p1739920511290749
I don't see this mentioned anywhere at https://project.pages.drupalcode.org/gitlab_templates/jobs/upgrade-status/ or otherwise. Google search is failing me. I've got a project I'm getting pinged about for a D11 issue. I'd love to run the upgrade status job via the bot. But if I do that, it's defaulting to the current core (11.1.x) and trying to check for D12 compatibility. I started a manual pipeline, and I didn't see any way to control "No, I want you to use D10 to run upgrade status to confirm D11 is cool".
- How do you do this?
- Shouldn't this be the default config for Upgrade status jobs? :sweat_smile:
The answer is when creating a manual pipeline, although there's no obvious choice in the initial list of variables to configure, if you manually set
DRUPAL_CORE
at last row of the form to^10
or10.4.2
or whatever you want, and then tweak the visibleRUN_JOB_UPGRADE_STATUS
variable to 1, you'll get what you need (a test run against previous major that then checks upgrade_status against the current major you're porting to)...