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

*: Pull in project-template 61d73a3 #3

Merged
merged 3 commits into from
Apr 5, 2018

Conversation

wking
Copy link
Contributor

@wking wking commented Apr 4, 2018

Seed this new project with the template, as specified in the TOB proposal. My personal preference is to merge to preserve the history and make future updates easier. But I've had trouble with that in the past (e.g. here), so this commit drops the template history.

I've localized .pullapprove.yml and kept @caniszczyk's README, but otherwise left project-template alone (EDIT: I've also updated MAINTAINERS). I expect the maintainers here will want to land some of the remaining in-flight project-template improvements once they take over (e.g. the broken security-issues link, opencontainers/project-template#34). But I've left those off this PR to be as unopinionated as possible.

Fixes #1.

wking added 2 commits April 4, 2018 15:17
Seed this new project with the template, as specified in the TOB
proposal [1].  My personal preference is to merge to preserve the
history and make future updates easier.  But I've had trouble with
that in the past [2], so this commit drops the template history.
Generated with:

  $ git remote add project-template git://github.com/opencontainers/project-template.git
  $ git fetch project-template
  $ git show --oneline project-template/master
  61d73a3 (project-template/master) Merge pull request opencontainers#40 from wking/minor-patch-bullet
  $ git read-tree project-template/master
  $ git add -A .
  $ git checkout HEAD -- README.md
  $ git commit -sv

[1]: https://github.com/opencontainers/tob/blob/3619df26faffa123e32a819ae32647a57fce4de2/proposals/distribution.md#governance-and-releases
[2]: opencontainers/go-digest#20 (comment)

Signed-off-by: W. Trevor King <[email protected]>
The other groups make sense for project-template, but we only need one
set here.

Signed-off-by: W. Trevor King <[email protected]>
MAINTAINERS Outdated
@@ -0,0 +1,8 @@
This meta-project is maintained by the union of MAINTAINERS for all OCI Projects [1].
Copy link
Member

Choose a reason for hiding this comment

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

distribution-spec-maintainers..

Copy link
Contributor Author

Choose a reason for hiding this comment

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

distribution-spec-maintainers..

Thanks, I've pushed 1c81711 to fix that.

Copy link
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

looks good to me..

@caniszczyk caniszczyk merged commit 3e7a8f6 into opencontainers:master Apr 5, 2018
@wking wking deleted the template branch April 6, 2018 21:10
wking added a commit to wking/distribution-spec that referenced this pull request Apr 10, 2018
CONTRIBUTING.md (which we got from project-template in be21fe9 (*:
Pull in project-template 61d73a3, 2018-04-04, opencontainers#3) covers this same
space.  Dropping the contrib docs from the README (and instead linking
to CONTRIBUTING.md) keeps us DRY (vs. having the content in each
location), gets us the GitHub contributing UI improvements [1]
(vs. having the content only in the README), keeps the information
discoverable (vs. having the content only in CONTRIBUTING and not
linking from the README), and gives us more space in the README to
talk about the project itself (contributing docs are only useful for a
subset of README readers).

[1]: https://help.github.com/articles/setting-guidelines-for-repository-contributors/

Signed-off-by: W. Trevor King <[email protected]>
wking added a commit to wking/distribution-spec that referenced this pull request Apr 10, 2018
CONTRIBUTING.md (which we got from project-template in be21fe9, *:
Pull in project-template 61d73a3, 2018-04-04, opencontainers#3) covers this same
space.  Dropping the contrib docs from the README (and instead linking
to CONTRIBUTING.md) keeps us DRY (vs. having the content in each
location), gets us the GitHub contributing UI improvements [1]
(vs. having the content only in the README), keeps the information
discoverable (vs. having the content only in CONTRIBUTING and not
linking from the README), and gives us more space in the README to
talk about the project itself (contributing docs are only useful for a
subset of README readers).

[1]: https://help.github.com/articles/setting-guidelines-for-repository-contributors/

Signed-off-by: W. Trevor King <[email protected]>
wking added a commit to wking/distribution-spec that referenced this pull request Apr 11, 2018
CONTRIBUTING.md (which we got from project-template in be21fe9, *:
Pull in project-template 61d73a3, 2018-04-04, opencontainers#3) covers this same
space.  Dropping the contrib docs from the README (and instead linking
to CONTRIBUTING.md) keeps us DRY (vs. having the content in each
location), gets us the GitHub contributing UI improvements [1]
(vs. having the content only in the README), keeps the information
discoverable (vs. having the content only in CONTRIBUTING and not
linking from the README), and gives us more space in the README to
talk about the project itself (contributing docs are only useful for a
subset of README readers).

I've copy/pasted the CONTRIBUTING.md content for issues and the
mailing list into the README at Stephen's request [2].  Personally I
don't have a problem with requiring readers to click through to
CONTRIBUTING to get this information, but I'm not a maintainer.  I am
slightly concerned that the copy/pasted discussion channel information
is even further from the security-disclosure section (for a paranoid
approach, see [3]), but I'll leave addressing that or not up to the
maintainers as well.

[1]: https://help.github.com/articles/setting-guidelines-for-repository-contributors/
[2]: opencontainers#9 (comment)
[3]: opencontainers/project-template#57

Signed-off-by: W. Trevor King <[email protected]>
wking added a commit to wking/distribution-spec that referenced this pull request Apr 11, 2018
CONTRIBUTING.md (which we got from project-template in be21fe9, *:
Pull in project-template 61d73a3, 2018-04-04, opencontainers#3) covers this same
space.  Dropping the contrib docs from the README (and instead linking
to CONTRIBUTING.md) keeps us DRY (vs. having the content in each
location), gets us the GitHub contributing UI improvements [1]
(vs. having the content only in the README), keeps the information
discoverable (vs. having the content only in CONTRIBUTING and not
linking from the README), and gives us more space in the README to
talk about the project itself (contributing docs are only useful for a
subset of README readers).

I've copy/pasted the CONTRIBUTING.md content for issues and the
mailing list into the README at Stephen's request [2], turning
"Issues" into a link in the process.  I've left it as a non-link in
CONTRIBUTING.md to stay closer to the upstream project-template, but
wouldn't have a problem making it a link there to if the maintainers
preferred that.  Personally I don't have a problem with requiring
readers to click through to CONTRIBUTING to get this information, but
I'm not a maintainer.  I am slightly concerned that the copy/pasted
discussion channel information is even further from the
security-disclosure section (for a paranoid approach, see [3]), but
I'll leave addressing that or not up to the maintainers as well.

[1]: https://help.github.com/articles/setting-guidelines-for-repository-contributors/
[2]: opencontainers#9 (comment)
[3]: opencontainers/project-template#57

Signed-off-by: W. Trevor King <[email protected]>
wking added a commit to wking/distribution-spec that referenced this pull request Apr 11, 2018
CONTRIBUTING.md (which we got from project-template in be21fe9, *:
Pull in project-template 61d73a3, 2018-04-04, opencontainers#3) covers this same
space.  Dropping the contrib docs from the README (and instead linking
to CONTRIBUTING.md) keeps us DRY (vs. having the content in each
location), gets us the GitHub contributing UI improvements [1]
(vs. having the content only in the README), keeps the information
discoverable (vs. having the content only in CONTRIBUTING and not
linking from the README), and gives us more space in the README to
talk about the project itself (contributing docs are only useful for a
subset of README readers).

I've copy/pasted the CONTRIBUTING.md content for issues and the
mailing list into the README at Stephen's request [2], turning
"Issues" into a link in the process and making some other minor
copy-edits.  I've left it as a non-link in CONTRIBUTING.md to stay
closer to the upstream project-template, but wouldn't have a problem
making it a link there to if the maintainers preferred that.  I've
also added a security reference based on my in-flight [3], also at
Stephen's request [4].  Personally I don't have a problem with
requiring readers to click through to CONTRIBUTING to get this
information (as long as the security information stays close to the
information for other channels [3]), but I'm not a maintainer.

[1]: https://help.github.com/articles/setting-guidelines-for-repository-contributors/
[2]: opencontainers#9 (comment)
[3]: opencontainers/project-template#57
[4]: opencontainers#9 (comment)

Signed-off-by: W. Trevor King <[email protected]>
sudo-bmitch pushed a commit to sudo-bmitch/distribution-spec that referenced this pull request Aug 1, 2022
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.

3 participants