Merge remote-tracking branch 'origin/main' into sr2024

Author: 8BitJosh

.github/workflows/validate.yml

@@ -3,7 +3,7 @@ name: Validate
 on:
   push:
     branches:
-      - master
+      - main
   pull_request: {}
 
 jobs:
@@ -14,7 +14,7 @@ jobs:
       # See https://github.com/ruby/setup-ruby/issues/291
       GLOBAL_GEMS: 1
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
 
@@ -31,7 +31,7 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Build container
       run: docker-compose build

Rakefile

@@ -35,7 +35,7 @@ end
 task :submodules => ['_sass/brand/.git']
 
 task :dev => [:dependencies, :submodules] do
-  sh('bundle exec jekyll serve --host 0.0.0.0 --drafts --config _config.yml')
+  sh('bundle exec jekyll serve --host 0.0.0.0 --drafts --config _config.yml,_dev.yml')
 end
 
 task :build => [:dependencies, :submodules] do

_config.yml

@@ -52,6 +52,8 @@ social:
     icon: tiktok
     link: https://www.tiktok.com/@studentrobotics
 
+user_tracking: true
+
 exclude:
   - README.md
   - Rakefile

_dev.yml

@@ -0,0 +1 @@
+user_tracking: false

_includes/script.html

@@ -10,7 +10,9 @@
   {% endfor %}
 {% endif %}
 
-<script defer data-domain="studentrobotics.org" src="https://plausible.io/js/plausible.js"></script>
+{% if site.user_tracking %}
+  <script defer data-domain="studentrobotics.org" src="https://plausible.io/js/plausible.js"></script>
+{% endif %}
 <script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>
 
 <script src="{{ '/js/navigation.js' | prepend: site.baseurl }}"></script>