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.

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

ci: add rebase on end of release process #361

Open
wants to merge 1 commit into
base: 2-dev
Choose a base branch
from

Conversation

sebtiz13
Copy link
Member

What does this PR do ?

Simply add rebase on end of release process to keep linear history

run: |
git fetch --no-tags origin 2-dev:2-dev
git rebase ${GITHUB_REF_NAME} 2-dev
git push origin 2-dev
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will not work since it require a force push (commit IDs are refresh each time you rebase). Note that the CI user will become the author/co-author of each rebased commit

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here that just, add the commit chore(release): x.x.x-beta.y [skip ci] created by semantic-release to the dev branch, as what is done in other repositories

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there's no force push as it is fast forward in principle

Copy link
Member

@etrousset etrousset left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to Aex B comment, this needs fixing?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants