Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Fix git node release --prepare update proposal workflow #882

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix git node release --prepare update proposal workflow #882

wants to merge 1 commit into from

Conversation

ruyadorno
Copy link
Member

@ruyadorno ruyadorno commented Jan 6, 2025 •
edited
Loading

This allows for updating a proposal once the proposal branch has already been created, PR opened, e.g:

git checkout v1.x-staging # go back to the staging branch
# make changes, rebase, add more commits, (likely force) push v1.x-staging to upstream
git node release -S --prepare 1.y.z # run release prepare script again
# proposal branch is now ready to be force-pushed to upstream, release commit and changelog are updated

@ruyadorno ruyadorno requested a review from RafaelGSS January 6, 2025 17:30
@codecov Codecov

This comment was marked as outdated.

Sign in to view
@ruyadorno ruyadorno force-pushed the fix-git-node-prepare-release-update-proposal branch from fec7e76 to 38ad9c8 Compare January 6, 2025 17:31
@ruyadorno

This comment was marked as outdated.

Sign in to view
aduh95
aduh95 reviewed Jan 6, 2025
View reviewed changes
lib/prepare_release.js Outdated Show resolved Hide resolved
@ruyadorno
fix(git-node): prepare_release resilient checkout
0a14955 
In `git node release --prepare` when checking out a new proposal branch
make sure it's also possible to update an already existing branch of
that same name instead of failing and terminating the automation.
@ruyadorno ruyadorno force-pushed the fix-git-node-prepare-release-update-proposal branch from 38ad9c8 to 0a14955 Compare January 6, 2025 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RafaelGSS RafaelGSS RafaelGSS approved these changes

@aduh95 aduh95 aduh95 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.
3 participants
@ruyadorno @aduh95 @RafaelGSS