Angela P Wen
41857bab35
Textually replace CodeQL version in package.json ( #2269 )
...
Textually replace CodeQL version in `package.json` instead of using `npm version`, which occasionally fails due to merge conflicts that arise in the `package.json` process.
Co-authored-by: Henry Mercer <henrymercer@github.com >
2024-05-01 10:10:05 -07:00
Nick Fyson
c7a8056fc3
simplify while loop
2024-04-16 15:05:09 +01:00
Nick Fyson
f2c09fb28a
fix handling of backport changelog
2024-04-15 15:54:09 +01:00
Josh Soref
427cfbe9a2
Add backticks around branch
2024-02-13 16:57:18 -05:00
nickfyson
8e086df084
raise explicit exception if EOF found when looking for changelog sections
2023-12-18 10:38:11 +00:00
nickfyson
0724061f76
preserve trailing whitespace when transforming CHANGELOG
2023-12-18 10:27:45 +00:00
nickfyson
fda1796670
rename regex for clarity
2023-12-15 18:45:36 +00:00
Nick Fyson
ee53012610
Apply suggestions from code review
...
Co-authored-by: Henry Mercer <henry.mercer@me.com >
2023-12-15 18:44:26 +00:00
nickfyson
e0c2b0a8a0
change version numbers inside processing function as well
2023-12-15 17:02:32 +00:00
nickfyson
8e4a6c7a90
improve handling of changelog processing for backports
2023-12-15 16:50:38 +00:00
nickfyson
7898bc2041
add pr check for node version consistency
2023-12-13 11:54:57 +00:00
nickfyson
ee748cf360
respond to more review comments
2023-12-06 12:22:12 +00:00
nickfyson
a6ea3c5a45
define backport commit message in constant
2023-12-06 11:41:27 +00:00
Nick Fyson
3537bea580
Apply suggestions from code review
...
Co-authored-by: Henry Mercer <henry.mercer@me.com >
2023-12-06 11:40:07 +00:00
nickfyson
b7f289ef4d
update release process to support multiple version
2023-12-04 14:28:55 +00:00
Henry Mercer
d966969093
Remove $ from version number
2023-01-26 15:22:33 +00:00
Henry Mercer
e0b20eea50
Migrate release script to template strings
2023-01-16 18:15:29 +00:00
Henry Mercer
218d40db4c
Remove v1 only parts of release script
2023-01-16 18:09:01 +00:00
Henry Mercer
51abddb49b
Delete the runner
2022-11-14 16:23:14 +00:00
Angela P Wen
c6c7d293ca
Clarify merging with merge commit ( #1291 )
...
* Clarify merging with merge commit
* Add merge commit message to mergeback PRs
2022-10-07 19:05:42 +00:00
Henry Mercer
fb28913d5c
Add advice to the backport PR on how to run the checks quicker
2022-09-16 14:54:21 +01:00
Henry Mercer
4f104676ac
Remove now-duplicated PR titles from release PR descriptions
2022-09-15 16:20:05 +01:00
Henry Mercer
a07454207a
Tweak whitespace in checklist for consistency
...
Co-authored-by: Andrew Eisenberg <aeisenberg@github.com >
2022-08-22 09:52:06 +01:00
Henry Mercer
2927215a2b
Apply suggestions from code review
...
Co-authored-by: Edoardo Pirovano <6748066+edoardopirovano@users.noreply.github.com >
2022-08-19 18:37:55 +01:00
Henry Mercer
c145823103
Make "Update release branch" workflow fail if npm version fails
2022-08-19 18:22:44 +01:00
Henry Mercer
3bb6c41212
Remove an extraneous commit during the release process
...
We only need to run `git commit` after the `git merge` call if there were conflicts.
2022-05-11 10:50:13 +01:00
Henry Mercer
2b8fdb3f2e
Merge branch 'main' into henrymercer/handle-merge-conflicts-in-releases
2022-04-25 17:02:03 +01:00
Henry Mercer
074853a9a2
Suggest resolving conflicts by adding new commits vs amending the merge commit
...
This gives us slightly messier git history, but more importantly makes
reviewing substantially easier.
2022-04-25 16:37:32 +01:00
Henry Mercer
9daf1de73c
Update references to release branches
...
Prepare for renaming `v1` -> `releases/v1` and `v2` -> `releases/v2`.
2022-04-14 17:48:46 +01:00
Henry Mercer
f6312f1322
Commit any conflicts during v1 backport to simplify release process
...
The process of creating the v1 release can run into merge conflicts. We
commit the unresolved conflicts so a maintainer can easily resolve them
(vs erroring and requiring maintainers to reconstruct the release
manually).
2022-04-14 16:08:38 +01:00
Henry Mercer
282b607642
Update changelog rewriting step to match v2+ only release notes
2022-03-29 16:10:02 +01:00
Henry Mercer
9a709c116e
Add changelog note
2022-03-28 16:39:46 +01:00
Henry Mercer
d0bd80897c
Expose a more restrictive interface to the release script
...
Give the release script modes rather
than source and target branches
2022-03-25 15:17:17 +00:00
Henry Mercer
bed132dae4
Use a more restrictive sed pattern
2022-03-25 13:40:41 +00:00
Henry Mercer
9d26fe0cb3
Use source branch and target branch names consistently
2022-03-25 12:55:00 +00:00
Henry Mercer
33599909af
Avoid conflicts by reverting 1.x version num commit from last v1 release
2022-03-24 18:18:45 +00:00
Henry Mercer
f143182488
Add "Update dependencies" label to v1 release PR
2022-03-24 18:18:45 +00:00
Henry Mercer
0b037b4fcb
Add merging the v1 release PR to the checklist
2022-03-24 18:18:45 +00:00
Henry Mercer
1668e0a2bf
Only mention merging the mergeback PR in the checklist when relevant
2022-03-24 18:18:45 +00:00
Henry Mercer
5fb01dd153
Avoid commits with duplicate names during v2 to v1 backport
2022-03-24 18:18:45 +00:00
Henry Mercer
b8f3a377bf
Fix exception when there are no commits to merge
2022-03-24 18:18:45 +00:00
Henry Mercer
d76b18254a
Add functionality for v2 -> v1 backports
2022-03-24 18:18:45 +00:00
Henry Mercer
ccda44cac5
Handle missing author information when generating changelog
2022-03-24 18:18:45 +00:00
Henry Mercer
81827d3fc6
Use the person triggering the release workflow as the conductor
2022-03-24 18:18:45 +00:00
Henry Mercer
b386fd4443
Parameterize release branch workflow over source and target branches
2022-03-24 18:18:45 +00:00
Henry Mercer
7eb261eac8
Create PRs as drafts to prompt maintainers to trigger PR checks
...
PR checks won't be triggered on PRs created by Actions workflows.
Therefore mark PRs created by workflows as draft to prompt maintainers
to take the PR out of draft, thereby triggering PR checks.
2021-08-03 18:21:41 +01:00
Andrew Eisenberg
629f582c03
Update changelog template
...
The changelog for an empty version will now be:
```
No user facing changes.
```
And this will appear in the final changelog when there is an actual release.
The benefits are that users will see regular release cycles and know
how old versions are even if there's no changes for a particular version
If we find that we are going months without any user facing changes, but
we have non-visible changes, then we can rethink this strategy.
But I think this is nicer than having empty sections for a version.
2021-06-22 14:25:06 -07:00
Andrew Eisenberg
d16268b273
Fix update-release-branch-fix.py
...
This change ensures that the the script can handle
commits with no committer in them. This will happen
for some commits that are auto-generated during
PRs.
2021-06-16 10:38:18 -07:00
Andrew Eisenberg
dd66f4484d
Remove leading newline
...
Minor change.
2021-05-31 08:12:29 -07:00
Andrew Eisenberg
800a951427
Add release and mergeback workflows
...
This commit ensures that the changelog is updated before a release with
the correct date and version.
Also, after a release, a mergeback PR is created to ensure that the
changelog update and version bump is available in main.
2021-05-21 11:04:38 -07:00
