Skip to content

Commit 314e6c8

Browse files
authored
Merge branch 'main' into 2024-11-13-meeting-notes
2 parents a263cdc + 1513f60 commit 314e6c8

24 files changed

+176
-74
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
blank_issues_enabled: true
22
contact_links:
3-
- name: Conda-forge Element chatroom
4-
url: https://app.element.io/#/room/#conda-forge:matrix.org
3+
- name: Conda-forge Zulip chatroom
4+
url: https://conda-forge.zulipchat.com/
55
about: Chat to us about conda-forge and ask general questions.
66
- name: Conda-forge documentation
77
url: https://conda-forge.org/docs/
88
about: The complete conda-forge documentation.
99
- name: Conda-forge packages
10-
url: https://conda-forge.org/feedstock-outputs/
10+
url: https://conda-forge.org/packages/
1111
about: For when you have an issue with a specific package.

.github/workflows/deploy.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: deploy
1313
runs-on: "ubuntu-latest"
1414
steps:
15-
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616

1717
- uses: conda-incubator/setup-miniconda@a4260408e20b96e80095f42ff7f1a15b27dd94ca # v3.0.4
1818
with:
@@ -43,10 +43,9 @@ jobs:
4343
user_email: [email protected]
4444

4545
- name: Link Checker
46-
uses: lycheeverse/lychee-action@2b973e86fc7b1f6b36a93795fe2c9c6ae1118621 # v1.10.0
46+
uses: lycheeverse/lychee-action@7cd0af4c74a61395d455af97419279d86aafaede # v2.0.2
4747
with:
4848
token: ${{ secrets.GITHUB_TOKEN }}
49-
lycheeVersion: "0.14.3"
5049
args: >
5150
--no-progress
5251
--timeout 60

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repos:
1515
- id: prettier
1616
types_or: [markdown, mdx, json, yaml, css, javascript]
1717
- repo: https://github.com/astral-sh/ruff-pre-commit
18-
rev: v0.7.1
18+
rev: v0.7.2
1919
hooks:
2020
- id: ruff-format
2121
ci:

README.md

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,6 @@ All reports will be kept confidential. Please have a look at the [Reporting guid
5252

5353
conda-forge's team and/or our event staff will try to ensure your safety and help with any immediate needs, particularly at an in-person event. Once we have received the report through the relevant authorities, conda-forge will make every effort to acknowledge the receipt and take action. Have a look at the process of [What Happens After a Report is Filed?](https://numfocus.org/code-of-conduct#enforcement).
5454

55-
## conda-forge dev meetings
55+
## conda-forge meetings
5656

57-
We hold biweekly meetings every second Wednesday from 17:00-18:00 (UTC). Feel free to stop by!
58-
Up-to-date invites are always available in the [conda.org community calendar](https://conda.org/community/calendar). Look for the `[conda-forge] core meeting` events!
59-
60-
Our [meeting notes](https://conda-forge.org/docs/orga/minutes/00_intro.html) record important points discussed during the meetings and serve as a record for upcoming meetings. We make use of [HackMd](https://hackmd.io/) and a [template](https://github.com/conda-forge/conda-forge.github.io/blob/main/misc/DEV_MEETING_TEMPLATE.md) to create the meeting notes.
61-
62-
We use a Github Actions [workflow][gha-workflow] to create an automated PR with the meeting notes
63-
template for each session, which is automatically published to our HackMD team account. During the
64-
meeting, attendees will edit the HackMD document. After the meeting, the document is saved and the
65-
PR is synced with the changes by adding the `sync-hackmd-notes` label. Once satisfied, the PR is
66-
merged and the website will be updated with the new meeting notes.
67-
68-
We encourage contributors to join the meetings and learn more about and from the community.
69-
70-
[gha-workflow]: https://github.com/conda-forge/conda-forge.github.io/actions/workflows/meeting-notes.yml
57+
Refer to our [Community > Meeting minutes](https://conda-forge.org/community/minutes/) page.

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ The role responsible for each step is noted at the beginning.
101101
[private advisory](https://github.com/conda-forge/conda-forge.github.io/security/advisories) for the text.
102102
- **Coordinator**: Publish the security advisory on the announcement date. If applicable, GitHub
103103
will post the CVE to the MITRE database.
104-
- **Coordinator**: Publish the blog post and other announcements (Element chat room, Twitter,
104+
- **Coordinator**: Publish the blog post and other announcements (Zulip, Twitter,
105105
etc) as necessary.
106106
- **Coordinator**: Notify the **Reporter** of the releases
107107
- **Coordinator**: Close the issue in the tracking repository

community/_sidebar.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,25 @@
1414
"contracting",
1515
{
1616
"type": "category",
17-
"label": "Meeting minutes",
17+
"label": "Meetings",
1818
"link": {
1919
"type": "doc",
20-
"id": "minutes"
20+
"id": "meetings"
2121
},
2222
"items": [
2323
{
24-
"type": "autogenerated",
25-
"dirName": "minutes"
24+
"type": "category",
25+
"label": "Minutes archive",
26+
"link": {
27+
"type": "doc",
28+
"id": "minutes"
29+
},
30+
"items": [
31+
{
32+
"type": "autogenerated",
33+
"dirName": "minutes"
34+
}
35+
]
2636
}
2737
]
2838
}

community/contracting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ If you are interested in a contractual engagement to solve a specific problem th
88
However, there are a number of community members that you may engage with.
99
conda-forge does not endorse anyone (individuals or companies) listed on this page.
1010

11-
If you are interested in a service that is not listed on this page, please reach out to us on our [issue tracker](https://github.com/conda-forge/conda-forge.github.io/issues), on [Element](https://app.element.io/#/room/#conda-forge:matrix.org) or via emailing the core team directly at [[email protected]](mailto:[email protected]) and we will help to circulate your request more broadly within the community.
11+
If you are interested in a service that is not listed on this page, please reach out to us on our [issue tracker](https://github.com/conda-forge/conda-forge.github.io/issues), on [Zulip](https://conda-forge.zulipchat.com/) or via emailing the core team directly at [[email protected]](mailto:[email protected]) and we will help to circulate your request more broadly within the community.
1212

1313
Our intent with this page is to communicate whom you should contact and negotiate a contract with.
1414
We hold no liability for the outcome of those negotiations or the results of any work that is done under those terms.

community/getting-in-touch.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,20 @@ The main issue trackers that you will interact with are
1414
- [Our main website repo](https://github.com/conda-forge/conda-forge.github.io/issues): You'll use this repo as a catch-all for issues where you're not sure where else to put them
1515
- [Our enhancement proposals repo](https://github.com/conda-forge/cfep/issues): You'll use the enhancement proposals repo if you're interested in substantially changing the way conda-forge operates.
1616

17+
## Zulip
18+
19+
The main chat platform in use. Sign up at [conda-forge.zulipchat.com](https://conda-forge.zulipchat.com/).
20+
1721
## Gitter and Element
1822

23+
:::{warning}
24+
As per CFEP-23, the Gitter/Matrix/Element rooms are no longer in use. Please use [Zulip](#zulip) instead.
25+
:::
26+
27+
<details>
28+
29+
<summary>Links to deprecated Matrix.io rooms</summary>
30+
1931
The main chat rooms that you'll interact with are
2032

2133
- [gitter: general](https://gitter.im/conda-forge/conda-forge.github.io): Our general chat room for all things conda-forge. Pretty much any question can be asked here and others in the community may be able to help.
@@ -31,6 +43,8 @@ The main chat rooms that you'll interact with are
3143

3244
Note: All Gitter room links forward to Element
3345

46+
</details>
47+
3448
## Forum
3549

3650
- [conda community discourse forum](https://conda.discourse.group/): The [conda-forge section](https://conda.discourse.group/c/pkg-building/conda-forge/25) is dedicated to discussions of conda-forge.

community/governance.md.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,11 +162,11 @@ This vote will end on {date}.
162162
time. In order for a timeout to occur, the vote must have:
163163
* been open for at least 2 weeks
164164
* been presented and discussed at a Core team meeting
165-
* been advertised on at least 3 separate occasions on the element core
165+
* been advertised on at least 3 separate occasions on the Zulip core
166166
chatroom (beginning of voting period, middle, and one day prior to
167167
proposed timeout)
168168
* been sent to core members via email. Email reminders must have been
169-
sent to the core email list in a manner similar to the element chatroom: at least 3 times,
169+
sent to the core email list in a manner similar to the Zulip chatroom: at least 3 times,
170170
occurring as beginning of voting period, middle, and one day
171171
prior to proposed timeout.
172172

community/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ title: 'conda-forge community'
88
- [Governance](governance.md)
99
- [Joining the team](joining-the-team.md)
1010
- [Contracting](contracting.md)
11-
- [Meeting minutes](minutes.mdx)
11+
- [Meetings](meetings.mdx)

0 commit comments

Comments
 (0)