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

Create GOVERNANCE.md #83

Merged
merged 5 commits into from
Mar 13, 2017
Merged

Create GOVERNANCE.md #83

merged 5 commits into from
Mar 13, 2017

Conversation

waldyrious
Copy link
Collaborator

see #81 for context.

@waldyrious waldyrious changed the title Create GOVERNANCE.md [WIP] Create GOVERNANCE.md Mar 11, 2017
@waldyrious
Copy link
Collaborator Author

waldyrious commented Mar 11, 2017

Do not merge yet. I will add content to the release section shortly.

Update: this is now ready for review. Pinging @Xymph and @hamstar for feedback :)

@waldyrious waldyrious changed the title [WIP] Create GOVERNANCE.md Create GOVERNANCE.md Mar 11, 2017
GOVERNANCE.md Outdated
(See [#81](https://github.com/hamstar/Wikimate/pull/81) for an example.)
It should apply the following actions:

1. Change the "Unreleased" heading in the CHANGELOG.md file
Copy link
Collaborator

Choose a reason for hiding this comment

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

The phrase we previously agreed on and used was "Current development".

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I can't recall how detailed the previous discussion was (I did a search but couldn't find it), but the rationale here is that if we're claiming/recommending Keep a Changelog compliance, then we should use the heading they propose, i.e. "Unreleased" (which IMO is also more explicit than "Current development", and fits better with the other headings), unless there are strong arguments to deviate from it.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Discussion led to issue #48, and the resulting commits were approved without further discussion it seems. So I guess our agreement was more implicit than I remembered.

Does adhering to a standard mean that we have no creative freedom to deviate in how we word something? Precedent does exist, although I've not found many more examples.
Anyway, I like "current development" better because it has a more positive and active connotation. Many words starting with "un" feel less so.

How exactly do you mean "fits better with the other headings"?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Discussion led to issue #48, and the resulting commits were approved without further discussion it seems. So I guess our agreement was more implicit than I remembered.

Ah, yes, thanks for the links :)

Does adhering to a standard mean that we have no creative freedom to deviate in how we word something? Precedent does exist, although I've not found many more examples.

I'd say we can deviate from the standard, if sufficient motive exists.

Anyway, I like "current development" better because it has a more positive and active connotation. Many words starting with "un" feel less so.

I can agree with this argument, but I'd rather we picked a different section name that still conforms to it. I'm afraid "Current development" may not be sufficiently clear. It certainly feels slightly awkward to my (non-native English speaker) ears, for the meaning it is intended to have.

How exactly do you mean "fits better with the other headings"?

I meant that all headings are version this, version that; so it would logically make sense (IMO) that the top heading is "upcoming version", "next release", "unreleased [version]", or something to that effect. Do any of these (or a variation thereof) appeal to you?

Copy link
Collaborator

Choose a reason for hiding this comment

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

I see, thanks for the clarification. TBH, none appeal much to me, nor appall me, but it took me a while to realize (or remember from the time when I choose "Current development") why.

On Git(Hub) the formal meaning of "release" is to tag the current state of affairs into something fixed, no longer in flux. But to me the very act of putting something online is already "releasing" it, in the practical meaning. That's how I worked with my previous, non-gitted projects; I didn't put anything online until it had enough quality and quantity to be version-able.

So "unreleased" or (worse) "next release" feels like a misnomer because the content under that heading is already in the master branch, is already "out there". I guess I'm still not quite used to GitHub's meaning of "release". To my equally non-native ears my original choice of header sounds like a adequate description of the entries below it, which can remain in a state of flux until tagged (see the number of PRs until WikiFile was ready).

But if you're still feeling awkward about it, then I'm fine with simply sticking to the Keepachangelog standard verbatim. We are, after all, working on GitHub now. 😄

Copy link
Collaborator Author

@waldyrious waldyrious Mar 12, 2017

Choose a reason for hiding this comment

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

I see what you mean, but yeah, I guess people do end up getting used to the github model. I never even considered any other interpretation until you brought this up :)

Now that I've thought about it more explicitly, I do believe this is a better way of working with FOSS, as it promotes openness and transparency of the development process: unpolished changes go in separate branches (and WIP commits can be easily squashed, amended, etc); changes ready for review by maintainers go to the PR stage; changes considered ready are merged into master; and changes that have been on master for a while (hopefully tested by the most intrepid users who prefer not to wait for releases) are released with a stable (immutable) tag, downloadable as an archive, bundled with release notes, supported by the maintainers, etc.

Given this, I don't think we should word the top section based on the premise that master is a "release". If none of the options appeal to you, I agree, let's stick to what Keep a Changelog suggests.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Alright, the "version x.y.x" header pattern makes "Unreleased version" a little more appealing than the others. If you agree, I'll update #85.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Agreed 👍

GOVERNANCE.md Outdated
1. **Every change** (except for very minor ones such as spelling fixes) **should be made via pull requests**,
rather than as direct commits to the repository.
2. **Maintainers should not merge their own pull requests**.
This allows every change to be validated by at least another maintainer
Copy link
Collaborator

Choose a reason for hiding this comment

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

+period

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Fixed. Nice attention to detail, as always ;)

@Xymph
Copy link
Collaborator

Xymph commented Mar 12, 2017

Two minor textual fixes, otherwise this looks fine to me. 👍

@waldyrious
Copy link
Collaborator Author

@Xymph if everything looks good, please merge (squashing sounds sensible here, I suppose) at your leisure.

Xymph added a commit to Xymph/Wikimate that referenced this pull request Mar 13, 2017
@Xymph
Copy link
Collaborator

Xymph commented Mar 13, 2017

I think a Changelog entry for the new file (under an "Added" heading) would make sense. To avoid a conflict, best review/merge #85 first.

@waldyrious
Copy link
Collaborator Author

Just to confirm, by the new file do you mean GOVERNANCE.md?

@Xymph
Copy link
Collaborator

Xymph commented Mar 13, 2017

Uhm, yes, what other new file was added in this "Create" PR? 😝

Xymph added a commit to Xymph/Wikimate that referenced this pull request Mar 13, 2017
@waldyrious
Copy link
Collaborator Author

@Xymph rebased and updated CHANGELOG.md -- thanks for the prompt.

CHANGELOG.md Outdated
@@ -89,5 +93,6 @@ Since v0.10.0 this project adheres to [Semantic Versioning](http://semver.org/)
[#76]: https://github.com/hamstar/Wikimate/pull/76
[#78]: https://github.com/hamstar/Wikimate/pull/78
[#80]: https://github.com/hamstar/Wikimate/pull/80
[#85]: https://github.com/hamstar/Wikimate/pull/83
Copy link
Collaborator

Choose a reason for hiding this comment

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

-> [#83]

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Argh. Good catch.

@Xymph
Copy link
Collaborator

Xymph commented Mar 13, 2017

Alright, your turn to wrap one up. 👍

@waldyrious waldyrious merged commit b23dbc0 into master Mar 13, 2017
@waldyrious waldyrious deleted the governance branch March 13, 2017 17:03
@waldyrious
Copy link
Collaborator Author

Took me quite a while, but I can finally check this off my todo list! Thanks for the review.

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.

2 participants