- Issue created by @jonathan1055
- 🇬🇧United Kingdom jonathan1055
This is only a change to the constant in check-versions.php
Passing pipeline
https://git.drupalcode.org/issue/gitlab_templates-3485054/-/pipelines/32... - First commit to issue fork.
- 🇪🇸Spain fjgarlin
We have these two variables in the
...hidden-variables.yml
file:# Development branch for next minor version of Drupal. CORE_MINOR: "11.x-dev" # Once the current minor-dev branch enters a beta phase, this is the dev branch for the *next* minor version. CORE_NEXT_MINOR: "11.x-dev"
The first one is not used anywhere in the templates, so we can update safely. The following one is use to run the "next minor" jobs. Currently, this is set to
11.x-dev
. Shouldn't we change it to11.1.x-dev
I don't know where the above leaves
11.x
, as it is clearly not yet the branch for next major.Thoughts?
- 🇪🇸Spain fjgarlin
I think that
CORE_NEXT_MINOR
should be updated, so I did that in the last commit. - 🇬🇧United Kingdom jonathan1055
Yes that looks OK, but I will run a test to confirm.
Regarding
11.x-dev
vs11.1.x-dev
I recall we were bitten by a surprise in 📌 Update templates so 11.0 is the default/current branch RTBC when the core D11 version that was being tested in 'next major' was not the same as the D11 branch which became 'current' after the switch. I need to go back to search the details. - 🇪🇸Spain fjgarlin
Yeah, in that case we had 11.x and 11.0.x.
Before the switch, we'd test 11.x as "next major", after the switch we'd test 11.0.x as the "current", and there was a core issue that we discovered that would only happen on 11.0.x.
Because of that, we changed to use stable tags for "current".
I think that CORE_NEXT_MINOR is ok being 11.1.x-dev, and CORE_NEXT being 11.x. And I don't think it makes sense to change CORE_MAJOR_DEVELOPMENT to 11.x yet.
So, effectively, after this change, 11.x won't be tested in the templates (we will have 11.0.5 and 11.1.x), but that's ok because there is the 11.1.x branch which will be used to branch the next minor.
- 🇬🇧United Kingdom jonathan1055
Yes that was it, thank you for getting the details.
Existing without this MR
Composer 'next minor'locking drupal/core (11.x-dev 4acf162)
https://git.drupalcode.org/project/scheduler/-/jobs/3241152
PHPUnit next minorDrupal: 11.0-dev
https://git.drupalcode.org/project/scheduler/-/jobs/3241181With this MR
Composer 'next minor'Locking drupal/core (11.1.x-dev 723960a) job did not complete
- 🇬🇧United Kingdom jonathan1055
The two changes look good, and the test works as intended. But before marking this RTBC I am going to make sure that 'check-versions' alerts us properly, now that
CORE_NEXT_MINOR
is 11.1.x-dev not 11.x-dev - 🇬🇧United Kingdom jonathan1055
Yes it all works fine. The script was always checking the value of
CORE_NEXT_MINOR
when it was of the form '10.n.x-dev'. Then we also allowed it to matchMAIN_BRANCH . '-dev'
in preparation for the D10 to D11 switch.RTBC from me.
-
fjgarlin →
committed 1d66266b on main authored by
jonathan1055 →
Issue #3485054 by jonathan1055, fjgarlin: Core 11.1.x is released,...
-
fjgarlin →
committed 1d66266b on main authored by
jonathan1055 →
-
fjgarlin →
committed d481712c on main
Issue #3485054: Changelog.
-
fjgarlin →
committed d481712c on main
- 🇬🇧United Kingdom jonathan1055
Good to get this merged, so that our 'check versions' will pass on the other MRs.
It will be informative to see if any contrib projects report a difference in PHPUnit / PHPStan / Nightwatch 'next minor' now that these jobs use Core
11.1.0-dev
instead of11.0-dev
. In #11 I updated the issue summary to include this change. Automatically closed - issue fixed for 2 weeks with no activity.