Merge branch 'main' into ief-calendar

Signed-off-by: Chris Lloyd-Jones <[email protected]>
Green-Software-Foundation · Sep 19, 2023 · 31501d5 · 31501d5
2 parents 4b1c096 + cda4f08
commit 31501d5
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # GSF Opensource WG
 
 > Find out more on our website at https://opensource.greensoftware.foundation/
-
+>
 ## Scope
 - Direct open-source, open-data and academic research in areas that advance the field of green software.
 - Sponsor key open-source and open-data projects to give confidence they will be supported and maintained for the long term.
@@ -11,12 +11,15 @@
 - Co-Chair - Dan Lewis-toakley (ThoughtWorks)
 
 ## Projects
-- [Awesome Green Software](https://github.com/Green-Software-Foundation/awesome-green-software)
-- [carbon-aware-sdk](https://github.com/Green-Software-Foundation/carbon-aware-sdk)
+- [Carbon Aware SDK](https://greensoftware.foundation/projects/carbon-aware-sdk)
+- [Awesome Green Software](https://greensoftware.foundation/projects/awesome-green-software)
+- [SCI Open Ontology](https://greensoftware.foundation/projects/sci-open-ontology)
+- [Carbon CI Pipeline Tooling](https://greensoftware.foundation/projects/carbon-ci-pipeline-tooling)
+- [Impact Engine Framework](https://github.com/green-Software-Foundation/ief/)
 
 ## Resources
-
-* [Add me to meeting - Members Only](https://greensoftware.foundation/onboarding/) (Work Email required)
+* [Send me the calendar invites- Members Only](https://greensoftware.foundation/subscribe/) (Work Email required)
+* [Add me to the foundation and working group - Members Only](https://greensoftware.foundation/onboarding/) (Work Email required)
 * [Shared Google Drive](https://drive.google.com/drive/folders/0AETfdYpYpIbxUk9PVA) (Members Only)
 * [Slack Channel](https://greensoftware-zzk1035.slack.com/archives/C024C0GB3LP) (Members Only)
 

diff --git a/docs/calendar.mdx b/docs/calendar.mdx
@@ -5,7 +5,7 @@ sidebar_position: 2
 import TeamMember, { TeamMembers } from "@site/src/components/TeamMember";
 import Image from "@theme/IdealImage";
 
-# Opensource Working Group
+# Calendar
 
 <div class="intro-logo">
   <img src="/img/logo.svg" alt="logo" />
@@ -20,12 +20,12 @@ import Image from "@theme/IdealImage";
 
 ### Calendar
 
-Every project runs according to a different cadence, and are open to all members. Links out to slack are member only, for those members that choose to use slack.
+[Members can use this link to get the calendar invites](https://greensoftware.foundation/subscribe/) (Work Email required.)
 
 | Project Name                                                                                                                                                                                                                                              | Cadence & Calendar Invite                                                                                                                                                                                                                                 |
 | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [Carbon Aware SDK](https://greensoftware.foundation/projects/carbon-aware-sdk) - [GitHub](https://github.com/Green-Software-Foundation/carbon-aware-sdk) - [Slack](https://greensoftwarefdn.slack.com/archives/C02JRAV4QEP)                               | Meeting every Tuesday 8am BST, meeting link pinned on Slack channel. Started 21st June 2022 [Calendar invite](https://zoom.us/meeting/tJcuc-uvpjMuEteq2zvXIv_-bngFHFQehHet/ics?icsToken=98tyKuCrrT8oHdydtBGERowqA4-ga-3xiFxbj7dYjU3_FRh6dDy7NOxFFJpZId3Y) |
-| [Awesome Green Software](https://greensoftware.foundation/projects/awesome-green-software) - [GitHub](https://github.com/Green-Software-Foundation/awesome-green-software) - [Slack](https://greensoftwarefdn.slack.com/archives/C02LHAW0KKQ)             | TBC                                                                                                                                                                                                                                                       |
-| [SCI Open Ontology](https://greensoftware.foundation/projects/sci-open-ontology) - [GitHub](https://github.com/Green-Software-Foundation/SCI_open_ontology) - [Slack](https://greensoftwarefdn.slack.com/archives/C02T3NU896X)                            | Meeting every alternative Wed, Started 4th May 2022                                                                                                                                                                                                       |
-| [Carbon CI Pipeline Tooling](https://greensoftware.foundation/projects/carbon-ci-pipeline-tooling) - [GitHub](https://github.com/Green-Software-Foundation/Carbon_CI_Pipeline_Tooling) - [Slack](https://greensoftwarefdn.slack.com/archives/C038YRLD2NN) | Meeting every Friday 3pm BST, meeting link pinned on Slack channel. Started 27th May 2022                                                                                                                                                                 |
+| [Carbon Aware SDK](https://greensoftware.foundation/projects/carbon-aware-sdk) - [GitHub](https://github.com/Green-Software-Foundation/carbon-aware-sdk)                              | Meeting every Tuesday 8am BST, meeting link pinned on Slack channel. Started 21st June 2022 [Calendar invite](https://zoom.us/meeting/tJcuc-uvpjMuEteq2zvXIv_-bngFHFQehHet/ics?icsToken=98tyKuCrrT8oHdydtBGERowqA4-ga-3xiFxbj7dYjU3_FRh6dDy7NOxFFJpZId3Y) |
+| [Awesome Green Software](https://greensoftware.foundation/projects/awesome-green-software) - [GitHub](https://github.com/Green-Software-Foundation/awesome-green-software)           | No meeting, takes place async.                                                                                                                                                                                                                                                      |
+| [SCI Open Ontology](https://greensoftware.foundation/projects/sci-open-ontology) - [GitHub](https://github.com/Green-Software-Foundation/SCI_open_ontology)                          | Meeting every alternative Wed, Started 4th May 2022                                                                                                                                                                                                       |
+| [Carbon CI Pipeline Tooling](https://greensoftware.foundation/projects/carbon-ci-pipeline-tooling) - [GitHub](https://github.com/Green-Software-Foundation/Carbon-ci) | Meeting bi-weekly Wednesday 3pm BST. Restarted 27th September 2023         |                                                                                                                                                        |                                                                                                                                             
 | [Impact Engine Framework](https://greensoftwarefoundation.atlassian.net/wiki/spaces/~612dd45e45cd76006a84071a/pages/17072136/Opensource+Impact+Engine+Framework) - [Github](https://github.com/Green-Software-Foundation/ief)  | Meeting every Thursday at 1130 UK on Google Meet |
diff --git a/docs/index.mdx b/docs/index.mdx
@@ -29,11 +29,7 @@ import Image from "@theme/IdealImage";
 - [Awesome Green Software](https://greensoftware.foundation/projects/awesome-green-software)
 - [SCI Open Ontology](https://greensoftware.foundation/projects/sci-open-ontology)
 - [Carbon CI Pipeline Tooling](https://greensoftware.foundation/projects/carbon-ci-pipeline-tooling)
-
-### Call for projects
-
-- A home for data
-- A way to standardise data interchange
+- [Impact Engine Framework](https://github.com/green-Software-Foundation/ief/)
 
 ### Proposing a new project
 
@@ -49,6 +45,8 @@ import Image from "@theme/IdealImage";
 
 ### Links
 
+- [Send me the calendar invites- Members Only](https://greensoftware.foundation/subscribe/) (Work Email required)
+- [Add me to the foundation and working group - Members Only](https://greensoftware.foundation/onboarding/) (Work Email required)
 - [Press Release FAQ](https://github.com/Green-Software-Foundation/pr-faqs/blob/main/live/green-software-principles.pr-faq.md)
 - [Main Website](https://opensource.greensoftware.foundation/)
 - [Main GitHub Repository](https://github.com/Green-Software-Foundation/innovation_wg)

diff --git a/docs/oss-projects.mdx b/docs/oss-projects.mdx
@@ -0,0 +1,27 @@
+---
+sidebar_position: 3
+---
+
+import TeamMember, { TeamMembers } from "@site/src/components/TeamMember";
+import Image from "@theme/IdealImage";
+
+# Open Source Projects - How they itneract
+
+<div>
+  <img src="/img/gsf-projects/gsf-projects-diagram.svg" />
+</div>
+<br />
+<br />
+
+## Summary
+
+- Develop a series of baseline specifications for Green Software.
+- Ensure that the specifications can be implemented in an interoperable fashion on the computing platforms in widespread use in both developed and developing regions.
+
+## How do our projects interact?
+
+<div>
+  <img src="/img/gsf-projects/gsf-projects-diagram.svg" />
+</div>
+<br />
+<br />
diff --git a/docs/gsf-projects-diagram.md → ...img/gsf-projects/gsf-projects-diagram.mmd b/docs/gsf-projects-diagram.md → ...img/gsf-projects/gsf-projects-diagram.mmd
@@ -1,4 +1,3 @@
-```mermaid
 flowchart BT
 classDef gsfProjectClass fill:#1d8e65
     0[Company ABCD] -->|Decides to reduce Carbon Emissions| 1
@@ -23,5 +22,4 @@ classDef gsfProjectClass fill:#1d8e65
     99 --> 100{Evaluating current \n Carbon emissions}
     28 --> 100
     100 --> |Decides to further  reduce emissions| 1
-    100 --> 101(((Reduced Carbon \n Emissions)))
-```
+    100 --> 101(((Reduced Carbon \n Emissions)))
diff --git a/static/img/gsf-projects/gsf-projects-diagram.svg b/static/img/gsf-projects/gsf-projects-diagram.svg