Skip to content

Commit f1bca32

Browse files
committed
Merge remote-tracking branch 'upstream/master' into update_maintainer_rules
Signed-off-by: Artur Souza <[email protected]>
2 parents 4ef888e + 5251655 commit f1bca32

14 files changed

+204
-76
lines changed

.github/ISSUE_TEMPLATE/community-call-agenda.md

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
2-
name: Community Call Meeting Agenda Issue
2+
name: Community Call Agenda Issue
33
about: Create a new community call agenda
4-
title: '<date>, Community Meeting Agenda'
4+
title: '<date>, Community Call Agenda'
55
assignees: ''
6-
6+
label: 'community call'
77
---
88

9-
## 📞 Dapr Community Meeting
9+
## 📞 Dapr Community Call Live Stream
1010

11-
Every two weeks we host a [community meeting](../#community-meetings) to highlight community created content, showcase new features, review upcoming milestones, and engage in Q&A with the Dapr community - all are welcome, and we encourage participation.
11+
Every two weeks we live-stream a [community call](../#community-meetings) to highlight community created content, showcase new features, review upcoming milestones, and engage in Q&A with the Dapr community - everyone is welcome, and we encourage you to attend or give a session!
1212

13-
The purpose of this thread is to form a discussion amongst the Dapr community on potential topics to highlight during the meeting. If you have a topic you wish to present or learn more about, please comment and be sure to include your name and a short description of the topic.
13+
The purpose of this issue is to form a discussion amongst the Dapr community on potential topics to highlight during the meeting. If you have a topic you wish to present or learn more about, please comment and be sure to include your name and a short description of the topic.
1414

1515
<!--
1616
!!!REMINDER!!!
@@ -21,7 +21,7 @@ The purpose of this thread is to form a discussion amongst the Dapr community on
2121

2222
The conversations in this thread will directly influence the meeting agenda for the community call on <Date>, at 9 AM PST ([See it in your local time](https://www.timeanddate.com/worldclock/fixedtime.html?iso=YYYYMMDDT09&p1=234&msg=Dapr+Community+Call)). The meeting agenda is finalized by a Community Call Host prior to the meeting.
2323

24-
See you at the community call! 👋
24+
**We'll be live-streaming to [YouTube](https://www.youtube.com/@DaprDev/streams). See you at the community call! 👋**
2525

2626
## Agenda
2727

@@ -63,7 +63,6 @@ See you at the community call! 👋
6363

6464
### After the meeting
6565

66-
- [ ] Upload the meeting to YouTube
6766
- [ ] Add chapters to the video
6867
- [ ] Add links to the video description
6968
- [ ] Read-only link to slides

.github/holopin.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
organization: dapr
2-
defaultSticker: clmjkxscc122740fl0mkmb7egi
2+
defaultSticker: clt3emu6c189400fjtk3prlisi
33
stickers:
4-
-
5-
id: clmjkxscc122740fl0mkmb7egi
6-
alias: ghc2023
4+
- id: clt3emu6c189400fjtk3prlisi
5+
alias: writer-badge
6+
- id: clt3egohs11570gjnanpizv28
7+
alias: presenter-badge

ADMINISTRATORS.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@ An administrator might perform the following duties without requiring approval f
3939

4040
## Limits and Expiration
4141

42-
The administrator role expires 6 months from the date it was approved. The process for renewal is the same as to become an administrator in the first place.
42+
The administrator role expires 2 years from the date it was approved. The process for renewal is the same as to become an administrator in the first place.
4343

4444
To minimize the number of people with access to shared credentials, there can only be 3 active or suspended administrators. Adding one more requires the STC to remove another.
4545

4646
## Removal
4747

4848
The administrator role is permanently removed in case any of the following:
49-
* Expiration of the 6 months term as administrator
49+
* Expiration of the term as administrator
5050
* Administrator is no longer a maintainer in Dapr
5151
* STC votes with simple majority to remove administrator
5252
* Administrator joins as an STC member

COMMUNITY-MANAGER.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ A community manager has the following responsibilities:
1919
* Help new Discord users find the right channels & answers.
2020
* Announce new Dapr releases and events.
2121
* Review issues & pull requests in the community repository.
22-
* Review and publish Dapr blog posts submitted by the community.
22+
* Review and publish [Dapr blog posts](https://github.com/dapr/blog) submitted by the community.
23+
* Review community contributions to [presentations](presentations/README.md) and [blog posts](blogposts/README.md) and award contributors with digital badges.
2324
* Report on community health, growth trends, and top issues to maintainers and STC.
2425
* Propose new partnerships with other adjacent communities to STC and manage them.
2526
* Manage community analytics tools, including Google Analytics, CommonRoom.io and Scarf.sh.
@@ -60,7 +61,7 @@ The following community managers have been approved by the STC:
6061
| - | - | - | - | - | - | - | -
6162
| Annu Singh | [@AnnuCode](https://github.com/annucode) | annusingh | Nirmata | Active | UTC+5.30/IST | Jan 1st, 2024 | Jan 1st, 2025
6263
| Cecil Phillip | [@cecilphillip](https://github.com/cecilphillip) | cecilphillip | Stripe | Active | UTC-5/EST | Jan 1st, 2024 | Jan 1st, 2025
63-
| Marc Duiker | [@marcduiker](https://github.com/marcduiker) | marcduiker | Diagrid | Active | UTC+1/CET | Feb 15th, 2023 | Feb 15th, 2024
64+
| Marc Duiker | [@marcduiker](https://github.com/marcduiker) | marcduiker | Diagrid | Active | UTC+1/CET | Apr 18th, 2024 | Apr 18th, 2025
6465
| Nyemade Uversky | [@nyemade-uversky](https://github.com/nyemade-uversky) | nuversky#2099 | Microsoft | Inactive | UTC-8/PST | Feb 15th, 2023 | Feb 15th, 2024
6566

6667
### Statuses

MAINTAINERS.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,23 @@
33
This is the list of maintainers for all Dapr repositories, in alphabetical order:
44

55
- Alessandro Segala (Microsoft) [@ItalyPaleAle](https://github.com/ItalyPaleAle)
6-
- Amulya Varote (Microsoft) [@amulyavarote](https://github.com/amulyavarote)
76
- Annu Singh (Nirmata) [@annucode](https://github.com/annucode) (non voting)
87
- Artur Souza (Diagrid) [@artursouza](https://github.com/artursouza)
98
- Bernd Verst (Microsoft) [@berndverst](https://github.com/berndverst)
10-
- Cecil Phillip (Stripe) [cecilphillip](https://github.com/cecilphillip) (non voting)
9+
- Cecil Phillip (Stripe) [@cecilphillip](https://github.com/cecilphillip) (non voting)
10+
- Deepanshu Agarwal (Microsoft) [@DeepanshuA](https://github.com/DeepanshuA)
1111
- Hannah Hunter (Microsoft) [@hhunter-ms](https://github.com/hhunter-ms)
1212
- Hal Spang (Microsoft) [@halspang](https://github.com/halspang)
13+
- Josh van Leeuwen (Diagrid) [@JoshVanL](https://github.com/JoshVanL)
1314
- Long Dai (Intel) [@daixiang0](https://github.com/daixiang0)
1415
- Marc Duiker (Diagrid) [@marcduiker](https://github.com/marcduiker) (non voting)
1516
- Mark Fussell (Diagrid) [@msfussell](https://github.com/msfussell)
17+
- Mike Nguyen (Independent) [@mikeee](https://github.com/mikeee)
1618
- Mukundan Sundararajan (Microsoft) [@mukundansundar](https://github.com/mukundansundar)
1719
- Nick Greenfield (Microsoft) [@greenie-msft](https://github.com/greenie-msft)
1820
- Paul Yuknewicz (Microsoft) [@paulyuk](https://github.com/paulyuk)
21+
- Phillip Hoff (Microsoft) [@philliphoff](https://github.com/philliphoff)
1922
- Rob Landers (Automattic) [@withinboredom](https://github.com/withinboredom)
20-
- Ryan Nowak (Microsoft) [@rynowak](https://github.com/rynowak)
2123
- Shubham Sharma (Microsoft) [@shubham1172](https://github.com/shubham1172)
2224
- Xavier Geernick (Proximus) [@XavierGeerinck](https://github.com/XavierGeerinck)
2325
- Yaron Schneider (Diagrid) [@yaron2](https://github.com/yaron2)

README.md

+46-46
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,25 @@
11
# Dapr Community
22

3+
[![License: Apache 2.0][apache-badge]][apache-url] [![Good First Issues][gfi-badge]][gfi-url] [![discord][discord-badge]][discord-url] [![YouTube][youtube-badge]][youtube-link] [![X/Twitter][x-badge]][x-link]
4+
5+
[apache-badge]: https://img.shields.io/github/license/dapr/dapr?style=flat&label=License&logo=github
6+
[apache-url]: https://github.com/dapr/dapr/blob/master/LICENSE
7+
[gfi-badge]:https://img.shields.io/github/issues-search/dapr/community?query=type%3Aissue%20is%3Aopen%20label%3A%22good%20first%20issue%22&label=Good%20first%20issues&style=flat&logo=github
8+
[gfi-url]:https://github.com/dapr/community/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22
9+
[discord-badge]: https://img.shields.io/discord/778680217417809931?label=Discord&style=flat&logo=discord
10+
[discord-url]: http://bit.ly/dapr-discord
11+
[youtube-badge]:https://img.shields.io/youtube/channel/views/UCtpSQ9BLB_3EXdWAUQYwnRA?style=flat&label=YouTube%20views&logo=youtube
12+
[youtube-link]:https://youtube.com/@daprdev
13+
[x-badge]:https://img.shields.io/twitter/follow/daprdev?logo=x&style=flat
14+
[x-link]:https://twitter.com/daprdev
15+
316
Welcome to the Dapr community. This is the starting point for becoming a contributor, improving the code and docs, giving presentations and all the goodness of helping out on the project. We are a friendly, collaborative group and look forward to working together.
417

518
- [Introduction](#introduction)
619
- [Dapr authors](#dapr-authors)
720
- [Questions and issues](#questions-and-issues)
821
- [Communication and Discord](#communication-and-discord)
9-
- [Community meetings](#community-meetings)
22+
- [Community calls](#community-calls)
1023
- [Upcoming dates](#upcoming-dates)
1124
- [Dapr Blog](#dapr-blog)
1225
- [Roles](#roles)
@@ -24,54 +37,29 @@ Visit [dapr.io](https://dapr.io) for information about Dapr.
2437
Dapr is an open source project with an active development community.
2538

2639
## Communication and Discord
27-
We would greatly appreciate your contributions and suggestions! One of the easiest ways to contribute is to participate in Discord discussions, chat on Discord IM or join the bi-monthly community calls.
40+
We would greatly appreciate your contributions and suggestions! One of the easiest ways to contribute is to participate in Discord discussions, or join the bi-monthly [community calls](#community-calls).
2841

2942
### Questions and issues
3043
Reach out with any questions you may have and we'll make sure to answer them as soon as possible and as a community member feel free to jump in and answer questions.
3144

3245
| Platform | Link |
3346
|:----------|:------------|
34-
| 💬 Discord (preferred) | [![Discord widget](https://discord.com/api/guilds/778680217417809931/widget.png?style=banner2)](https://aka.ms/dapr-discord)<br />https://aka.ms/dapr-discord
47+
| 💬 Discord (preferred) | [![Discord widget](https://discord.com/api/guilds/778680217417809931/widget.png?style=banner2)](http://bit.ly/dapr-discord)<br />http://bit.ly/dapr-discord
3548
| 🐤 Twitter | [@daprdev](https://twitter.com/daprdev)
3649

37-
### Community meetings
38-
Every two weeks we host a community meeting to showcase new features, review upcoming milestones, and engage in a Q&A. For community calls, anyone from the Dapr community can participate, present a topic, or host. All are welcome!
39-
40-
<!--To present a specific topic on the next Dapr community call start by filling out this short form, [Dapr community call presenter sign-up form](https://forms.gle/Aa9L8iK32J4MBkxj7).
41-
-->
50+
### Community calls
4251

43-
Issues in the community repo are used to suggest topics for a Dapr community. The next three upcoming community meetings are pinned as issues in this repository and can be used to enter in suggestions for the meeting. To speak about a Dapr related topic on a community call just enter your topic to the agenda issue marked for the date you would like to present on. Alternatively, you're also welcomed to use the the Discord Community Call Chat channel to talk about future agenda topics. The meeting agenda for each call is finalized by the community call host.
52+
> You can watch our community calls live on our [YouTube stream](https://www.youtube.com/@DaprDev/streams) or rewatch the recording later on the [Dapr YouTube channel](https://www.youtube.com/@daprdev).
4453
45-
Community members (members of the Dapr GitHub org) can nominate themselves via an issue on the dapr/community repository to be a community call host. Members become approved community call hosts when two or more existing community hosts approve their request, similar to how members and approvers get accepted today.
54+
Every two weeks we live stream a community call on [YouTube](https://www.youtube.com/@daprdev) to showcase new features, highlight client case studies, review upcoming milestones, and engage in a Q&A. For these community calls, anyone from the Dapr community can participate, present a topic, or host. All are welcome!
4655

47-
You can always catch up offline by watching the recordings on the Dapr YouTube channel.
56+
[Issues in this community repo](https://github.com/dapr/community/issues) are used to plan the community calls and suggest topics. The next three upcoming calls are pinned as issues in this repository and can be used to submit suggestions for the call. To speak about a Dapr related topic on a community call, comment on the issue for the date you would like to present on. Alternatively, you're also welcome to use the #general channel in the [Dapr Discord server](https://bit.ly/dapr-discord) to talk about future agenda topics. The meeting agenda for each call is finalized by the community call host.
4857

49-
<!--
50-
!!!REMINDER!!!
51-
Do not add passcode to the Zoom URL.
52-
-->
53-
| Asset | Link |
54-
|:-----------|:------------|
55-
| 🔗 Meeting Link & Password | **Zoom Call:** https://zoom.us/j/92337656846<br>**Passcode:** 815623
56-
| 🎥 Meeting Recordings | http://aka.ms/dapr-recordings
57-
58-
#### Upcoming dates
59-
60-
Use the upcoming calendar events below to add the community call events to your calendar.
61-
62-
<!--
63-
!!!REMINDER!!!
58+
Community members (members of the Dapr GitHub org) can nominate themselves via an issue on the dapr/community repository to be a community call host. Members become approved community call hosts when two or more existing community hosts approve their request, similar to how members and approvers get accepted today.
6459

65-
When adding new scheduled meetings to this list:
66-
* make sure to update the URL for each entry too. The `iso` param should be updated following the `YYYYMMDD` format.
67-
* make sure the suffix is correct for the numeral: `st`, `nd`, `th` so it reads right like `22nd` and not `22th`
68-
-->
60+
#### Upcoming community call dates
6961

70-
| Date & time | Agenda
71-
| - | -
72-
| Wednesday January 10<sup>th</sup> 9:00am Pacific Time (PST) - [See it in your local time and add to your calendar](https://www.timeanddate.com/worldclock/fixedtime.html?iso=20240110T09&p1=234&msg=Dapr+Community+Call) | dapr/community#375
73-
| Wednesday January 24<sup>th</sup> 9:00am Pacific Time (PST) - [See it in your local time and add to your calendar](https://www.timeanddate.com/worldclock/fixedtime.html?iso=20240124T09&p1=234&msg=Dapr+Community+Call) | dapr/community#376
74-
| Wednesday February 7<sup>th</sup> 9:00am Pacific Time (PST) - [See it in your local time and add to your calendar](https://www.timeanddate.com/worldclock/fixedtime.html?iso=20240207T09&p1=234&msg=Dapr+Community+Call) | dapr/community#377
62+
Use this [issue query](https://github.com/dapr/community/issues?q=is%3Aissue+is%3Aopen+label%3A%22community+call%22) to check the date and agenda for the upcoming community calls.
7563

7664
#### China Community Meetings
7765

@@ -91,7 +79,7 @@ We are using a different link from Community Call because the Community Call req
9179
**Zoom Call:** https://zoom.us/j/91940016938<br> <!-- Do not add password to the Zoom URL. -->
9280
**Meeting ID:** 919 4001 6938<br>
9381
**Passcode:** 152697<br>
94-
**Schedule:** Tuesdays at 7:30am Pacific Time.
82+
**Schedule:** Tuesdays at 9:00am US/Pacific Time (PT).
9583

9684
Visit [here](https://github.com/dapr/community/blob/master/release-process.md) to learn more about the Dapr release process.
9785

@@ -124,21 +112,35 @@ The [Dapr blog](https://blog.dapr.io/posts) has regular posts on releases, techn
124112

125113
There are a several different roles that are available in the community.
126114

127-
### Community membership
128-
There are various contributor roles in the Dapr community that you are strongly encouraged to be part of. Read [Community membership](community-membership.md)
129-
for more information.
115+
### Community membership roles
116+
117+
Everyone is welcome to contribute to Dapr. Contribution can take many forms, it could be contributing source code to the many repositories, updating documentation, writing blog posts, or helping the community by answering questions on Discord or other social channels.
118+
119+
These are the various contributor roles that are available in the Dapr community:
120+
121+
- Contributor
122+
- Member
123+
- Approver
124+
- Maintainer
125+
- Administrator
126+
127+
These roles are described in detail in [Community membership](community-membership.md).
128+
129+
### Special roles
130+
131+
Outside of the regular contributor roles, there are a few special roles that are available in the Dapr project.
132+
133+
#### Release team
130134

131-
### Release team
132135
At the start of a milestone a release team is chosen. The release team has the responsibility of enforcing processes to ensure the release is successfully delivered. Read about the [Release process](https://github.com/dapr/community/blob/master/release-process.md#release-team)
133136
for more information.
134137

135-
### Steering committee member
138+
#### Steering committee member
139+
136140
The Dapr project has a single governance body called the Steering and Technical Committee (STC). The STC is responsible for the health of the Dapr community and for overall technical oversight. Read [Steering and Technical Committee (STC)](steering-and-technical-committee-charter.md)for more information.
137141

138-
### Administrator Role
139-
Administrators have access to credentials equivalent to members of the steering and technical commitee (STC) and are responsible to perform pre-approved routine maintenance duties and ad-hoc tasks delegated by the STC without making isolated decisions. Read [Administrator Role](ADMINISTRATORS.md) for more information.
142+
#### Community manager
140143

141-
### Community Manager Role
142144
Community managers are responsible for managing many aspects of the Dapr community. The role is to engage and promote the Dapr community and have someone that the community can reach out to for guidance. Read [Community Manager](COMMUNITY-MANAGER.md) for more information.
143145

144146
## How can I get involved?
@@ -154,8 +156,6 @@ If you're looking for something to work on, read the [contribution guidelines](h
154156

155157
And, we can always use more testing, have more and improved docs, or just write a blog post on what you have discovered whilst using Dapr.
156158

157-
If you're a developer, read the [development guide](https://github.com/dapr/dapr/tree/master/docs/development) for help on how to get started.
158-
159159
Finally consider achieving one of the many [roles](#roles) that are in the Dapr project.
160160

161161
## Other Documents

0 commit comments

Comments
 (0)