Skip to content

Commit

Permalink
Merge branch 'main' into anonrig/code-of-conduct
Browse files Browse the repository at this point in the history
  • Loading branch information
ovflowd committed Dec 12, 2022
2 parents 49114ec + a09afad commit cac15ac
Show file tree
Hide file tree
Showing 7 changed files with 81 additions and 28 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/link-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
linkinator:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: JustinBeckwith/linkinator-action@v1
with:
paths: "**/*.md"
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/linter-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v3

- name: Use Node.js 12.x
uses: actions/setup-node@v1
- name: Use Node.js 18.x
uses: actions/setup-node@v3
with:
node-version: 12.x
node-version: 18
check-latest: true

- name: npm install
run: npm ci
Expand Down
3 changes: 2 additions & 1 deletion Dates-and-Reminders.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ This document will be used to capture dates and reminders to review before each
- Director 1 election - term ends February 28
- Director 2 election - term ends July 31
- CPC Impact voting member selection - term ends July 31
- CPC Non-impact voting member election - term ends July 31
- CPC At-Large voting member election - term ends July 31
- CPC Regular member voting member election - term ends July 31
- Review issues labeled [`cpc-quartely-review`](https://github.com/openjs-foundation/cross-project-council/labels/cpc-quartely-review) at the end of every quarter
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ According to the [CPC Charter](./CPC-CHARTER.md#voting-members), up to two regul
members can be elected as voting members. The two regular members elected as voting members are currently:

- Michael Dawson ([@mhdawson](https://github.com/mhdawson), IBM)
- Jordan Harband ([@ljharb](https://github.com/ljharb))

#### Collaboration space representatives

Expand Down
1 change: 1 addition & 0 deletions TRAVEL_FUND/2022.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ Lea | Verou | TAG meeting | TAG member || London, UK | 25 - 28 Jul 2022 | 1800 U
Waleed | Ashraf | Collab Summit | CPC || Ireland | 30 Sept - 6 Oct 2022 | 1825 USD | 30 Aug 2022 | [link](https://github.com/openjs-foundation/cross-project-council/pull/931)
Claudio | Wunder | Collab Summit | Project Member || Ireland | 30 Sept - 3 Oct 2022 | 1050 USD | 10 Sept 2022 | tbd
Ruy | Adorno | Collab Summit | Project Member || Ireland | 30 Sept - 5 Oct 2022 | 1563 USD | 19 Sep 2022 | [link](https://github.com/openjs-foundation/cross-project-council/pull/938)
Xiaoji | Chen | Open Visualization Collab Summit | Speaker + Project Member || Madrid, Spain | 21 Sept - 24 Sept 2022 | 2106 USD | 27 Oct 2022 | tbd
||||||| Total | 20519 USD |
70 changes: 70 additions & 0 deletions meetings/2022/2022-11-22.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# OpenJS Foundation Cross Project Council Meeting 2022-11-22

## Links

* **Recording**: https://www.youtube.com/watch?v=ufcW891ls30
* **GitHub Issue**: https://github.com/openjs-foundation/cross-project-council/issues/971

## Present

* Joe Sepi (@joesepi)
* Rich Trott (@Trott)
* Darcy Clarke (@darcyclarke)
* Abby Cabunoc Mayes (@abbycabs)
* Robin Ginn (@rginn)
* Tobie Langel (@tobie)
* Kylie Wagar-Dirks (@kyliewd)

## Agenda

### Announcements
* Open Source in Finance - FINOS event in NYC on Dec 8
* Security Collab Space meeting after this meeting

### Board Meeting Updates

*Extracted from **cross-project-council-agenda** labeled issues and pull requests from the **openjs-foundation org** prior to the meeting.

### openjs-foundation/cross-project-council

* What are these repos? [#957](https://github.com/openjs-foundation/cross-project-council/issues/957)
* Can do this sort of cleanup in a working session

* Funds for project-driven initiatives [#953](https://github.com/openjs-foundation/cross-project-council/issues/953)
* Robin will be adding comment in issue. The Board is open and we’re working on a process.

* Add patching script for CoC modifications [#910](https://github.com/openjs-foundation/cross-project-council/issues/910)
* See PR https://github.com/openjs-foundation/cross-project-council/pull/972 for initial effort

* Update Contributor Covenant Code of Conduct to v2.1 [#851](https://github.com/openjs-foundation/cross-project-council/pull/851)
*

* Clarify requirements around CoC violation [#786](https://github.com/openjs-foundation/cross-project-council/issues/786)
* No update

* Code of Conduct missing for a number of projects in projects table in README [#664](https://github.com/openjs-foundation/cross-project-council/issues/664)
* Agreed to remove that column from the table and make the CoC the canonical resource for this. Make sure that the readme very clearly references the main CoC.

* Licence check support/tooling [#815](https://github.com/openjs-foundation/cross-project-council/issues/815)
* LF IT is looking at this for early 2023. There is interest from other LF sub-foundations.

* Develop annual review process for projects [#592](https://github.com/openjs-foundation/cross-project-council/issues/592)
* Use working session to build this out.

## Next week's working session

* Working session: Simplifying CPC governance [#958](https://github.com/openjs-foundation/cross-project-council/issues/958)

## Dates and Reminders

Please review regularly our list of dates and reminders:
https://github.com/openjs-foundation/cross-project-council/blob/main/Dates-and-Reminders.md

## Q&A, Other

## Upcoming Meetings

* **Calendar**: <https://calendar.openjsf.org>

Click `+GoogleCalendar` at the bottom right to add to your own Google calendar.

23 changes: 1 addition & 22 deletions project-resources/MEMBER_TRAVEL_FUND.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,28 +156,7 @@ A project may request an allocation from the travel fund as follows:

## Reimbursement

So that we can reimburse you more quickly, we strongly encourage you to use
[Expensify](https://expensify.com) to organize and submit your receipts.

### Here are the highlights of the process:

* A free [Expensify](https://www.expensify.com/) account is sufficient.
* You can use the Android and iOS apps to capture receipts while you are
traveling. If you do not use the app, you will need to upload photos of your
receipts after you return.
* When you add an expense, please use local currency so that it matches the
amount on the receipt.
* Once you have uploaded your receipts, please add them to a report and submit
it with [operations@openjsf.org](mailto:operations@openjsf.org) on cc, and the
Memo field set to "YOURNAME - TRIPNAME".

When we receive your report, we will send you a form via DocuSign to collect
your payment details. At that point, you're done.

### Alternate process

If you decide not to or cannot use Expensify, the reimbursement process is manual
and may take longer for us to process. Please send an email over to [operations@openjsf.org](mailto:operations@openjsf.org) or reach out to Foundation staff on the OpenJS Foundation Slack.
Please send an email over to [operations@openjsf.org](mailto:operations@openjsf.org) or reach out to Foundation staff on the OpenJS Foundation Slack.

### Important:

Expand Down

0 comments on commit cac15ac

Please sign in to comment.