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

ADR0012 - versioning scheme & branching #59

Merged
merged 6 commits into from
Feb 22, 2021
Merged

Conversation

toban
Copy link
Contributor

@toban toban commented Feb 8, 2021

@toban toban changed the title add ADR0012 ADR0012 - versioning scheme & branching Feb 8, 2021

As for the tag itself we also need to decide on version-numbering scheme for differentiating releases where the WMF version number does not change. Seeing that MediaWiki is already using the semantic versioning for incrementing their (maintenance releases) releases in between new release branches being cut it makes sense for wikibase to adopt a similar process as we will still rely on the release branches for future releases.

Example: The patch release following 1.35 (1.35.0) will be known as 1.35.1
Copy link
Contributor

Choose a reason for hiding this comment

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

I have some concerns that this could be confusing. Imagine the following situation:

We release 1.35.0 which contains Mediawiki 1.35.0.
We release 1.35.1 which contains Mediawiki 1.35.0 and also some additional extensions and bug fix to Quickstatements.
WMF releases a 1.35.1 security patch release of Mediawiki
We release 1.35.2 which contains Mediawiki 1.35.1 (and the previous changes mentioned)

This sound to me like we might confuse ourselves let-alone users.

Copy link
Contributor

Choose a reason for hiding this comment

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

My strawman proposed solution stolen from the ticket is:
We release 1.35.0-wmde0 which contains Mediawiki 1.35.0.
We release 1.35.0-wmde1 which contains Mediawiki 1.35.0 and also some additional extensions and bug fix to Quickstatements.
WMF releases a 1.35.1 security patch release of Mediawiki
We release 1.35.1-wmde0 which contains Mediawiki 1.35.1 (and the previous changes mentioned)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All very valid points. I've updated the ADR with the first argument and adopted your suggestion with a slight modification.

@toban
Copy link
Contributor Author

toban commented Feb 10, 2021

Should I just bump this to accepted now?

@mariushoch
Copy link
Member

Should I just bump this to accepted now?

IMO, go for it.

Copy link
Member

@manicki manicki left a comment

Choose a reason for hiding this comment

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

Overall looks good. I am having some doubts about the mentioning of the semantic versioning, but overall this document is fine and could go in in my opinion.

docs/adr/0012-versioning.md Outdated Show resolved Hide resolved
docs/adr/0012-versioning.md Outdated Show resolved Hide resolved
docs/adr/0012-versioning.md Outdated Show resolved Hide resolved
toban and others added 2 commits February 19, 2021 15:39
Co-authored-by: Leszek Manicki <leszek.manicki@wikimedia.de>


Example: A Wikibase release based on 1.35.0 would be versioned as 1.35.0-wmde.0
Example: A queryservice frontend release would be versioned wmde.0, wmde.1 etc.
Copy link
Member

Choose a reason for hiding this comment

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

thanks for this addition!

@manicki manicki merged commit b835fd5 into main Feb 22, 2021
@manicki manicki deleted the add-adr-12-versioning branch February 22, 2021 12:12
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