Merge branch 'main' into deviantintegral-patch-8

Lullabot · Oct 2, 2024 · d76e4b8 · d76e4b8
2 parents 5937fec + 350f739
commit d76e4b8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/BuildGitHubPages.yml b/.github/workflows/BuildGitHubPages.yml
@@ -8,7 +8,7 @@ concurrency:
 
 jobs:
   Build-GitHub-Pages:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
@@ -59,7 +59,7 @@ jobs:
           path: _book
 
   Publish-GitHub-Pages:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [Build-GitHub-Pages]
     if: github.ref == 'refs/heads/main'
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 as node
+FROM ubuntu:24.04 as node
 
 RUN adduser node
 WORKDIR /home/node/app

diff --git a/yarn.lock b/yarn.lock
@@ -2930,9 +2930,9 @@ p-locate@^6.0.0:
     p-limit "^4.0.0"
 
 package-json-from-dist@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz#e501cd3094b278495eb4258d4c9f6d5ac3019f00"
-  integrity sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz#4f1471a010827a86f94cfd9b0727e36d267de505"
+  integrity sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==
 
 parse-json@^4.0.0:
   version "4.0.0"