Merge branch 'production'

lotusk08 · May 18, 2024 · 6cb1a5a · 6cb1a5a
2 parents 90a4cc7 + 20987f2
commit 6cb1a5a
Show file tree

Hide file tree

Showing 12 changed files with 181 additions and 195 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -35,3 +35,6 @@ jobs:
   publish:
     needs: release
     uses: ./.github/workflows/publish.yml
+    secrets:
+      GH_PAT: ${{ secrets.GH_PAT }}
+      BUILDER: ${{ secrets.BUILDER }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - "master"
+      - "hotfix/**"
     paths-ignore:
       - ".github/**"
       - "!.github/workflows/ci.yml"

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -5,6 +5,11 @@ on:
     branches:
       - docs
   workflow_call:
+    secrets:
+      GH_PAT:
+        required: true
+      BUILDER:
+        required: true
 
 jobs:
   launch:

diff --git a/.github/workflows/style-lint.yml b/.github/workflows/style-lint.yml
@@ -2,7 +2,7 @@ name: "Style Lint"
 
 on:
   push:
-    branches: ["master"]
+    branches: ["master", "hotfix/**"]
     paths: ["_sass/**/*.scss"]
   pull_request:
     paths: ["_sass/**/*.scss"]

diff --git a/_data/origin/cors.yml b/_data/origin/cors.yml
@@ -20,24 +20,24 @@ webfonts: https://fonts.googleapis.com/css2?family=Lato:wght@300;400&family=Sour
 # Libraries
 
 toc:
-  css: https://cdn.jsdelivr.net/npm/tocbot@4.25.0/dist/tocbot.min.css
-  js: https://cdn.jsdelivr.net/npm/tocbot@4.25.0/dist/tocbot.min.js
+  css: https://cdn.jsdelivr.net/npm/tocbot@4.27.20/dist/tocbot.min.css
+  js: https://cdn.jsdelivr.net/npm/tocbot@4.27.20/dist/tocbot.min.js
 
 fontawesome:
-  css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.1/css/all.min.css
+  css: https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@6.5.2/css/all.min.css
 
 search:
   js: https://cdn.jsdelivr.net/npm/simple-jekyll-search@1.10.0/dest/simple-jekyll-search.min.js
 
 mermaid:
-  js: https://cdn.jsdelivr.net/npm/mermaid@10.8.0/dist/mermaid.min.js
+  js: https://cdn.jsdelivr.net/npm/mermaid@10.9.0/dist/mermaid.min.js
 
 dayjs:
   js:
-    common: https://cdn.jsdelivr.net/npm/dayjs@1.11.10/dayjs.min.js
-    locale: https://cdn.jsdelivr.net/npm/dayjs@1.11.10/locale/:LOCALE.min.js
-    relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1.11.10/plugin/relativeTime.min.js
-    localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1.11.10/plugin/localizedFormat.min.js
+    common: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/dayjs.min.js
+    locale: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/locale/:LOCALE.min.js
+    relativeTime: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/plugin/relativeTime.min.js
+    localizedFormat: https://cdn.jsdelivr.net/npm/dayjs@1.11.11/plugin/localizedFormat.min.js
 
 glightbox:
   css: https://cdn.jsdelivr.net/npm/glightbox@3.3.0/dist/css/glightbox.min.css

diff --git a/_includes/embed/audio.html b/_includes/embed/audio.html
@@ -4,7 +4,7 @@
 
 {% unless src contains '://' %}
   {%- capture src -%}
-    {% include media-url.html src=src %}
+    {% include media-url.html src=src subpath=page.media_subpath %}
   {%- endcapture -%}
 {% endunless %}
 

diff --git a/_includes/embed/video.html b/_includes/embed/video.html
@@ -5,7 +5,7 @@
 
 {% unless video_url contains '://' %}
   {%- capture video_url -%}
-    {% include media-url.html src=video_url %}
+    {% include media-url.html src=video_url subpath=page.media_subpath %}
   {%- endcapture -%}
 {% endunless %}
 

diff --git a/_includes/pageviews/goatcounter.html b/_includes/pageviews/goatcounter.html
@@ -9,7 +9,8 @@
     fetch(url)
       .then((response) => response.json())
       .then((data) => {
-        pv.innerText = new Intl.NumberFormat().format(data.count);
+        const count = data.count.replace(/\s/g, '');
+        pv.innerText = new Intl.NumberFormat().format(count);
       })
       .catch((error) => {
         pv.innerText = '1';