Merge branch 'main' into dependabot/github_actions/actions/download-a…

…rtifact-4
sustainers · Jul 17, 2024 · 1d96383 · 1d96383
2 parents 1085bc4 + 4c2cdcf
commit 1d96383
Show file tree

Hide file tree

Showing 25 changed files with 145 additions and 76 deletions.
diff --git a/.github/workflows/calibreapp-image-actions.yml b/.github/workflows/calibreapp-image-actions.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Compress Images
         uses: calibreapp/[email protected] # TODO: if they start using a tag like v1, switch to that

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,10 +20,10 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE }}
           cache: npm
@@ -61,7 +61,7 @@ jobs:
     if: github.repository == 'sustainers/website' && github.ref == 'refs/heads/main'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Download docs
         uses: actions/download-artifact@v4

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -24,7 +24,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1

diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+2.7.7
diff --git a/Gemfile b/Gemfile
@@ -5,6 +5,7 @@ gem 'jekyll', '~> 4.2.2'
 gem 'jekyll-redirect-from', '~> 0.16.0'
 gem 'jekyll-seo-tag', '~> 2.8.0'
 gem 'jekyll-sitemap', '~> 1.4.0'
+gem 'jekyll-feed', '~> 0.17.0'
 gem 'wdm', '~> 0.1.1', :install_if => Gem.win_platform?
 
 gem "webrick", "~> 1.7"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,30 +1,30 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.3)
     em-websocket (0.5.3)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
     eventmachine (1.2.7)
     eventmachine (1.2.7-x64-mingw32)
-    ffi (1.15.5)
-    ffi (1.15.5-x64-mingw32)
+    ffi (1.16.3)
+    ffi (1.16.3-x64-mingw32)
     forwardable-extended (2.6.0)
-    html-proofer (3.19.3)
+    html-proofer (3.19.4)
       addressable (~> 2.3)
       mercenary (~> 0.3)
-      nokogiri (~> 1.12)
-      parallel (~> 1.3)
+      nokogiri (~> 1.13)
+      parallel (~> 1.10)
       rainbow (~> 3.0)
       typhoeus (~> 1.3)
       yell (~> 2.0)
     http_parser.rb (0.8.0)
-    i18n (1.10.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     jekyll (4.2.2)
       addressable (~> 2.4)
@@ -41,6 +41,8 @@ GEM
       rouge (~> 3.0)
       safe_yaml (~> 1.0)
       terminal-table (~> 2.0)
+    jekyll-feed (0.17.0)
+      jekyll (>= 3.7, < 5.0)
     jekyll-redirect-from (0.16.0)
       jekyll (>= 3.3, < 5.0)
     jekyll-sass-converter (2.2.0)
@@ -51,44 +53,46 @@ GEM
       jekyll (>= 3.7, < 5.0)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    kramdown (2.3.2)
+    kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    liquid (4.0.3)
-    listen (3.7.1)
+    liquid (4.0.4)
+    listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     mercenary (0.4.0)
-    mini_portile2 (2.8.0)
-    nokogiri (1.13.6)
-      mini_portile2 (~> 2.8.0)
+    mini_portile2 (2.8.5)
+    nokogiri (1.15.6)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.13.6-x64-mingw32)
+    nokogiri (1.15.6-x64-mingw32)
       racc (~> 1.4)
-    parallel (1.22.0)
+    parallel (1.24.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (4.0.6)
-    racc (1.6.0)
+    public_suffix (5.0.4)
+    racc (1.7.3)
     rainbow (3.1.1)
-    rb-fsevent (0.11.1)
+    rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rexml (3.2.5)
-    rouge (3.28.0)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
+    rouge (3.30.0)
     safe_yaml (1.0.5)
     sassc (2.4.0)
       ffi (~> 1.9)
     sassc (2.4.0-x64-mingw32)
       ffi (~> 1.9)
+    strscan (3.1.0)
     terminal-table (2.0.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     unicode-display_width (1.8.0)
     wdm (0.1.1)
-    webrick (1.7.0)
+    webrick (1.8.1)
     yell (2.2.2)
 
 PLATFORMS
@@ -98,6 +102,7 @@ PLATFORMS
 DEPENDENCIES
   html-proofer (~> 3.19.3)
   jekyll (~> 4.2.2)
+  jekyll-feed (~> 0.17.0)
   jekyll-redirect-from (~> 0.16.0)
   jekyll-seo-tag (~> 2.8.0)
   jekyll-sitemap (~> 1.4.0)

diff --git a/_config.yml b/_config.yml
@@ -19,6 +19,7 @@ plugins:
   - jekyll-redirect-from
   - jekyll-seo-tag
   - jekyll-sitemap
+  - jekyll-feed
 
 sass:
   style:            compressed
@@ -47,12 +48,11 @@ exclude:
 params:
   github:           "https://github.com/sustainers"
   slack:            "https://slack.opencollective.org"
-  twitter:          "https://twitter.com/SustainOSS"
   discourse:        "https://discourse.sustainoss.org"
 
 # Social-related stuff
-author:
-  twitter:          "SustainOSS"
+#author:
+#  twitter:          "SustainOSS"
 
 twitter:
   card:             "summary_large_image"

diff --git a/_data/events.yml b/_data/events.yml
@@ -2,6 +2,7 @@
   location: Lagos, Nigeria
   date: June 15-17, 2023
   logo: sustain-africa-2023.svg
+  url: https://blog.oscafrica.org/sustain-africa-2023-community-report
   ranking: 1
 
 - title: Sustain Africa 2022

diff --git a/_includes/footer.html b/_includes/footer.html
@@ -58,16 +58,21 @@
                 {%- include icons/slack.svg -%}
               </a>
             </li>
-            <li class="list-inline-item mx-1 mx-sm-3">
+<!--             <li class="list-inline-item mx-1 mx-sm-3">
               <a href="{{ site.params.twitter }}" rel="noopener" target="_blank" title="Twitter">
                 {%- include icons/twitter.svg -%}
               </a>
-            </li>
+            </li> -->
             <li class="list-inline-item ml-1 ml-sm-3">
               <a href="{{ site.params.discourse }}" rel="noopener" target="_blank" title="Discourse">
                 {%- include icons/discourse.svg -%}
               </a>
             </li>
+            <li class="list-inline-item ml-1 ml-sm-3">
+              <a href="/feed.xml" rel="noopener" target="_blank" title="RSS/Atom Feed">
+                {%- include icons/rss-fill.svg -%}
+              </a>
+            </li>
           </ul>
         </div>
       </div>

diff --git a/_includes/header.html b/_includes/header.html
@@ -10,6 +10,8 @@
 
   <meta name="referrer" content="strict-origin-when-cross-origin">
 
+  {% feed_meta %}
+
   {%- include head/favicons.html -%}
 
   <link rel="dns-prefetch" href="https://fonts.googleapis.com/">

diff --git a/_includes/icons/rss-fill.svg b/_includes/icons/rss-fill.svg
diff --git a/_posts/2021-05-24-design-is-your-friend.md b/_posts/2021-05-24-design-is-your-friend.md
@@ -2,6 +2,7 @@
 layout: post
 title: "Design is Your Friend: Harnessing the Power of Design (and designers) in Open Source"
 permalink: /blog/:title/
+author: "Eriol"
 ---
 
 <p class="highlight">

diff --git a/_posts/2022-08-08-sustainoss-organizing-committee.md b/_posts/2022-08-08-sustainoss-organizing-committee.md
@@ -2,6 +2,7 @@
 layout: post
 title: "SustainOSS Organizing Committee – Sustain Workshops and Funding Applications"
 permalink: /blog/:title/
+author: "Richard Littauer"
 ---
 
 ## Purpose:

diff --git a/_posts/2022-09-12-james-webb-space-telescope.md b/_posts/2022-09-12-james-webb-space-telescope.md
@@ -2,6 +2,7 @@
 layout: post
 title: "Open Source Influencing Space Programs: James Webb Space Telescope"
 permalink: /blog/:title/
+author: "Anita Ihuman"
 ---
 
 <p class="highlight">

diff --git a/...-11-06-rebooting-the-diversity-equity-and-inclusion-working-group-in-sustain.md b/...-11-06-rebooting-the-diversity-equity-and-inclusion-working-group-in-sustain.md
@@ -2,6 +2,7 @@
 layout: post
 title: "Rebooting the Diversity, Equity, and Inclusion Working Group in Sustain OSS"
 permalink: /blog/:title/
+author: "Anita Ihuman"
 ---
 
 

diff --git a/_posts/2023-12-12-dropping-x.md b/_posts/2023-12-12-dropping-x.md
@@ -2,6 +2,7 @@
 layout: post
 title: "Dropping X"
 permalink: /blog/:title/
+author: "Richard Littauer"
 ---
 
 

diff --git a/_posts/2023-12-13-community-report-for-sustain-africa-2022.md b/_posts/2023-12-13-community-report-for-sustain-africa-2022.md
@@ -2,8 +2,9 @@
 layout: post
 title: "Community Report for Sustain Africa 2022"
 permalink: /blog/:title/
+author: "Bolaji Ayodeji"
 ---
-    
+
 ![image](/assets/img/events/sustain-africa-2022.svg)
 
 ---

diff --git a/_posts/2024-01-08-community-report-for-sustain-africa-2023.md b/_posts/2024-01-08-community-report-for-sustain-africa-2023.md
@@ -0,0 +1,30 @@
+---
+layout: post
+title: "Community Report for Sustain Africa 2023"
+permalink: /blog/:title/
+author: "Bolaji Ayodeji"
+---
+
+<div style="text-align: center; margin: 60px auto;">
+  <img src="/assets/img/events/sustain-africa-2023.jpg" alt="An image showing the participants of Sustain Africa 2023" />
+</div>
+
+---
+
+On 16th June 2023, the yearly [Sustain Africa](https://festival.oscafrica.org/sustain-africa) event (a satellite event using the Sustain brand) happened in Lagos, Nigeria, bringing OSS contributors and maintainers from different countries in Africa. [Open Source Community Africa](https://oscafrica.org), a community of open-source enthusiasts, advocates, and experts within and across Africa, hosted the event. This year, they had seven (7) working groups, including:
+
+* Open Source Software Development
+* Open Source Documentation
+* Open Source Design
+* Open Source Data Science
+* Open Source Marketing and Funding
+* Open Source Programs and Specialized Projects
+* Open Source Burnout and Mental Health
+
+The conversation around the comprehensive overview of how FOSS is developed, maintained, utilized, and providing a roadmap for solving the cultural, financial, and institutional issues among open-source project maintainers continues to be the focus of Sustain. Kindly read the [community report](https://blog.oscafrica.org/sustain-africa-2023-community-report) to learn more about the outputs of the summit.
+
+---
+
+<p class="highlight">
+Sustain looks forward to more events like this around the world. If you're interested in how Sustain has hosted events, want to host your event, or want to use the Sustain brand as part of your event, please get in touch and let us know.
+</p>
diff --git a/about/index.md b/about/index.md
@@ -79,15 +79,15 @@ slug: about
 
     <ul>
     <li><a href="https://jekyllrb.com/">Jekyll</a> and <a href="{{ site.params.github }}/website/blob/main/Gemfile">gems</a></li>
-    <li><a href="https://getbootstrap.com/">Bootstrap v4</a> as our framework.</li>
+    <li><a href="https://getbootstrap.com/">Bootstrap v4</a> as our framework</li>
     <li><a href="https://pages.github.com/">GitHub Pages</a> for hosting the website</li>
     <li><a href="https://www.cloudflare.com/">Cloudflare</a> for security and optimizations</li>
     </ul>
 
     <p>Also, we are <a href="https://validator.w3.org/check/referer" data-proofer-ignore>HTML5</a> valid and try to be
     <a class="text-decoration-none" href="https://www.w3.org/WAI/WCAG2AA-Conformance">WCAG2AA</a> compliant.</p>
 
-    <p>As well, we keep <a href="/about/best-practices">a list of best practices</a> for organisation. Take a look!</p>
+    <p>As well, we keep <a href="/about/best-practices">a list of best practices</a> for the organisation. Take a look!</p>
 
   </div>
 </div>

diff --git a/assets/img/events/sustain-africa-2023.jpg b/assets/img/events/sustain-africa-2023.jpg
diff --git a/assets/img/podcast-logos/ossforclimate.jpg b/assets/img/podcast-logos/ossforclimate.jpg