Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

feat(git-node): add release promotion step #835

Merged
merged 50 commits into from
Nov 13, 2024
Merged

feat(git-node): add release promotion step #835

merged 50 commits into from
Nov 13, 2024

Conversation

aduh95
Copy link
Contributor

@aduh95 aduh95 commented Jul 22, 2024 •
edited
Loading

You can try it with git node release -S --promote https://github.com/nodejs/node/pull/53945.

Supersedes #402

/cc @nodejs/releasers

codebytere and others added 30 commits May 20, 2020 11:45
@codebytere
git-node: add release promotion step
9ee6605
@codebytere
Move newVersion to named arg
15c4cb0
@codebytere
Split out promotion verification steps
0ec3327
@codebytere
Fix verification spinners
a1c3ef1
@codebytere
Verify ncurc is set up
61dbeb7
@codebytere @targos
Properly trim getCommitSha result
ea29f87 
Co-Authored-By: Michaël Zasso <targos@protonmail.com>
@codebytere
Address some feedback
c0db1ce
@codebytere
Ensure synced with upstream/master
7d23d70
@codebytere
fix: run release script asynchronously
692c6b7
@codebytere
Run secureTagRelease() asynchronously
c1ab158
@codebytere
Run cherry-pick asynchronously
ddfe6ef
@codebytere
Remove unneccessary quotes
3377b44
@aduh95
Merge branch 'main' of https://github.com/nodejs/node-core-utils
88b99f3
@aduh95
nits
a08566d
@aduh95
esm
0229ccf
@aduh95
some refactor + more checks
ba23781
@aduh95
fixup! Merge branch 'main' of https://github.com/nodejs/node-core-utils
8ef8c41
@aduh95
throw on error to get non-zero exit code
8d02a41
@aduh95
lint
15c0335
@aduh95
validate CHANGELOG heading
ce72380
@aduh95
add support for PR URL
519388c
@aduh95
check if local HEAD is in sync with release proposal
a1b1974
@aduh95
Use existing tryResetBranch instead of custom git command
6db9959
@aduh95
auto fix node_version conflicts
3cc80b1
@aduh95
add --dryRun mode to simplify testing
04b4d4d
@aduh95
fix conflicts making the process crash
70294cf
@aduh95
fix bug when checking modified files
549ac8e
@aduh95
do not hard code default branch name
4bd64c9
@aduh95
fix type
1104f09
@aduh95
add --gpgSign/-S option
5b91899
@aduh95
Copy link
Contributor Author

aduh95 commented Oct 4, 2024

It is v20.x-staging, which is normal from my pov

Does it need to be v20.x-staging for something else? Landing backport PR maybe? Asking because I'm wondering if we should rename it to defaultBranch to avoid the confusion – or if I choose just make an API call to get the name of the default branch (and assume there's a local branch with that name)

@targos
Copy link
Member

targos commented Oct 4, 2024

I believe it's for backport PRs, but I'm not sure.

@aduh95
Copy link
Contributor Author

aduh95 commented Oct 12, 2024 •
edited
Loading

I've confirmed that to land a (backport or not) PR to a staging branch, NCU request you to set a different branch in your config. I've updated the promotion script to make an API call to get the name of the default branch instead of relying on the config.
I've also added a fallback when the version tag already exists to not crash if it points to the right commit and is correctly signed.

@aduh95
Copy link
Contributor Author

aduh95 commented Nov 13, 2024

I've tried it with the v18.20.5 release, and did not get any blocker. I'm tempted to land it, we might still want to iterate on it but I think it's at a point where we can rely on it. @nodejs/releasers, wdyt?

@targos
Copy link
Member

targos commented Nov 13, 2024

LGTM

RafaelGSS added a commit to RafaelGSS/node that referenced this pull request Nov 13, 2024
@RafaelGSS
doc: include git node release --promote to steps
a2d8afc 
Refs: nodejs/node-core-utils#835
@RafaelGSS RafaelGSS mentioned this pull request Nov 13, 2024
Merged
@aduh95 aduh95 merged commit dfa9c92 into nodejs:main Nov 13, 2024
10 of 11 checks passed
@aduh95 aduh95 deleted the git-node-release-promote branch November 13, 2024 14:07
@nodejs-github-bot nodejs-github-bot mentioned this pull request Nov 13, 2024
Merged
nodejs-github-bot pushed a commit to nodejs/node that referenced this pull request Nov 19, 2024
@RafaelGSS
doc: include git node release --promote to steps
172841c 
Refs: nodejs/node-core-utils#835
PR-URL: #55835
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
tpoisseau pushed a commit to tpoisseau/node that referenced this pull request Nov 21, 2024
@RafaelGSS @tpoisseau
doc: include git node release --promote to steps
f644c83 
Refs: nodejs/node-core-utils#835
PR-URL: nodejs#55835
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Ceres6 pushed a commit to Ceres6/node that referenced this pull request Nov 26, 2024
@RafaelGSS @Ceres6
doc: include git node release --promote to steps
87cb587 
Refs: nodejs/node-core-utils#835
PR-URL: nodejs#55835
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
aduh95 pushed a commit to nodejs/node that referenced this pull request Nov 26, 2024
@RafaelGSS @aduh95
doc: include git node release --promote to steps
219f5f2 
Refs: nodejs/node-core-utils#835
PR-URL: #55835
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
aduh95 pushed a commit to nodejs/node that referenced this pull request Dec 10, 2024
@RafaelGSS @aduh95
doc: include git node release --promote to steps
478fe36 
Refs: nodejs/node-core-utils#835
PR-URL: #55835
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
ruyadorno pushed a commit to nodejs/node that referenced this pull request Jan 5, 2025
@RafaelGSS @ruyadorno
doc: include git node release --promote to steps
3e6b3a9 
Refs: nodejs/node-core-utils#835
PR-URL: #55835
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
marco-ippolito pushed a commit to nodejs/node that referenced this pull request Jan 22, 2025
@RafaelGSS @marco-ippolito
doc: include git node release --promote to steps
e52cedd 
Refs: nodejs/node-core-utils#835
PR-URL: #55835
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
marco-ippolito pushed a commit to nodejs/node that referenced this pull request Jan 22, 2025
@RafaelGSS @marco-ippolito
doc: include git node release --promote to steps
b36f966 
Refs: nodejs/node-core-utils#835
PR-URL: #55835
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
marco-ippolito pushed a commit to nodejs/node that referenced this pull request Jan 22, 2025
@RafaelGSS @marco-ippolito
doc: include git node release --promote to steps
0e0d61d 
Refs: nodejs/node-core-utils#835
PR-URL: #55835
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
marco-ippolito pushed a commit to nodejs/node that referenced this pull request Jan 24, 2025
@RafaelGSS @marco-ippolito
doc: include git node release --promote to steps
61de8f9 
Refs: nodejs/node-core-utils#835
PR-URL: #55835
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
@richardlau richardlau mentioned this pull request Feb 4, 2025
Merged
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@targos targos targos approved these changes

@RafaelGSS RafaelGSS RafaelGSS approved these changes

@marco-ippolito marco-ippolito marco-ippolito approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@aduh95 @ruyadorno @targos @RafaelGSS @marco-ippolito @codebytere