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

CONTRIBUTING: Add "usually" wiggle to the meeting text #55

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

wking
Copy link
Contributor

@wking wking commented Apr 6, 2018

This allows us to make occasional exceptions, e.g. around the holidays, without needing to adjust the text in all consuming projects. Instead, we can just ping the mailing list and bump the central iCalendar in runtime-spec (or wherever we end up keeping the central iCalendar).

The text is from the recently-landed opencontainers/runtime-spec#943 as part of synchronizing this repository with current downstream improvements (#4).

This allows us to make occasional exceptions, e.g. around the holidays
[1] without needing to adjust the text in all consuming projects.
Instead, we can just ping the mailing list and bump the central
iCalendar in runtime-spec (or wherever we end up keeping the central
iCalendar).

[1]: https://groups.google.com/a/opencontainers.org/d/msg/dev/FzclHQsMH_c/QKJMybRkBAAJ
     Subject: Re: 2017-12-06 agenda
     Date: Thu, 7 Dec 2017 09:14:32 -0600
     Message-ID: <CAJg1wMQFVvT+UiJ1gj3m2AzLQEus82eoWRVVtBEe+ZBMxskq=w@mail.gmail.com>

Signed-off-by: W. Trevor King <[email protected]>
wking added a commit to wking/opencontainer-runtime-spec that referenced this pull request Apr 6, 2018
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 merge --squash --allow-unrelated-histories project-template/master
  $ git checkout HEAD -- .pullapprove.yml MAINTAINERS README.md RELEASES.md
  $ git checkout project-template/master -- GOVERNANCE.md LICENSE
  $ emacs README.md CONTRIBUTING.md # unify around project-template's CONTRIBUTING.md approach
  $ emacs meeting.ics  # update link to point at CONTRIBUTING.md#meetings
  $ git commit -sv

I personally prefer non-squash merges to preserve history and ease
future updates, but that approach has not been popular within the OCI
[1,2], so I'm going with a squash-merge here.

I'm sticking with the local RELEASES.md, because it uses four-space
indents.  I've filed [3] to upstream that change.

I've also filed [4] upstreaming our local wording change from 70ba4e6
(meeting: Bump January meeting from the 3rd to the 10th, 2017-12-07,
opencontainers#943).

I've also fixed the GOVERNANCE.md security link in flight with [5].

I've left the other in-flight project-template changes alone [6].

I've wrapped the URL in meetings.ics to avoid [7]:

  Line length should not be longer than 75 characters near line opencontainers#33
  Reference: RFC 5545 3.1. Content Lines

[1]: opencontainers/go-digest#20 (comment)
[2]: opencontainers/runtime-tools#274 (comment)
[3]: opencontainers/project-template#54
[4]: opencontainers/project-template#55
[5]: opencontainers/project-template#34
[6]: https://github.com/opencontainers/project-template/pulls
[7]: https://icalendar.org/validator.html

Signed-off-by: W. Trevor King <[email protected]>
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.

1 participant