Support for Drupal 7 is ending on 5 January 2025—it’s time to migrate to Drupal 10! Learn about the many benefits of Drupal 10 and find migration tools in our resource center.
The tag 8.9.19 is not on any branch. It should be merged into branch 8.9.x.
Comment | File | Size | Author |
---|---|---|---|
#8 | 3238373-plugin.es6_.js_.patch | 711 bytes | longwave |
#3 | 3238373.patch | 80.07 KB | longwave |
Issue fork drupal-3238373
Show commands
Start within a Git clone of the project using the version control instructions.
Or, if you do not have SSH keys set up on git.drupalcode.org:
- 3238373-merge-8.9.19-into changes, plain diff MR !1223
Comments
Comment #2
longwaveI guess this is critical, because anyone tracking the branch won't have the security fixes in 8.9.19.
Comment #3
longwaveMerged in 8.9.19, resolved merge conflicts, updated VERSION to 8.9.20-dev.
Comment #5
longwaveActually, it looks like this applies to all branches. None of the security releases have been merged back to 8.9.x, 9.1.x, 9.2.x or 9.3.x:
Comment #6
longwaveSetting RTBC, although there is no patch, because core committers are the only ones that can fix this.
Comment #7
catch9.2.6 also isn't a clean merge any more either. It might be best to recreate the patches for 9.2.x and 9.3.x
9.1.6 would be fine except for the usual version stuff, but getting a js lint error:
Comment #8
longwave@catch if I get a clean checkout of 9.2.x and then cherry-pick each of those commits in order, they merge in cleanly for me:
After this the only issue is bumping the VERSION constant.
Similarly this works for 9.1.x and 8.9.x.
The attached patch then solves the eslint issue with plugin.es6.js.
Comment #9
Liam MorlandIt is preferable to do this using
git merge
so that in visual Git tools, it is clear that the tags are included in the dev branch.Comment #10
catchMis-typed about 9.2.x not merging cleanly, too much editing of the comment and took the wrong bit out.
The issue was a CS fail rather than a merge error.
https://www.drupal.org/project/drupal/issues/3238373#comment-14235009 - works great for the js lint issue.
Did the following for the CS error on 9.3.x and 9.2.x:
9.1.x also happy with the merge + patch (no cs fail in the test to fix there), and so was 8.9.x
With 9.3.x, I went ahead and cherry-picked the commits from #8, which all cherry-pick cleanly individually, and better than having to recreate patches. Then I made separate commits for the cs and js lint errors.
I think that is all of it, but would be great if someone could verify all this so leaving RTBC.
Comment #12
Liam MorlandIn 8.9.x composer.lock, there are two blocks of merge conflict markup:
The same sort of problem exists in 9.2.x.
Comment #16
Liam MorlandThanks! I have reviewed that the three branches are properly merged and that 9.3.x has the security commits.
Comment #17
xjmSorry all; this was my fail. I missed that a push failed. Thanks for fixing it!