Skip to content

Conversation

@BYK
Copy link
Member

@BYK BYK commented Dec 15, 2020

A copy of getsentry/sentry#22657 with fixes included.

That said this one is a bit different. We used to use the extra option no-merge when publishing to keep the release branches and also keep master on nightly versions. If we want to keep this, we need to add per-project overrides to getsentry/publish which would increase complexity at this early stage for this fringe case. Instead, I opted to follow what getsentry/sentry does: merge but then immediately after that update the version.

@BYK BYK requested a review from chadwhitacre December 15, 2020 12:05
Copy link
Member

@chadwhitacre chadwhitacre left a comment

Choose a reason for hiding this comment

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

Skimmed, looks reasonable, have not tested

@BYK BYK merged commit 500c02b into master Dec 15, 2020
@BYK BYK deleted the byk/ci/centralized-repo branch December 15, 2020 15:52
@github-actions github-actions bot locked and limited conversation to collaborators Dec 31, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants