Merge remote-tracking branch 'origin/master'

modrinth · Aug 17, 2024 · 1f8d569 · 1f8d569
2 parents 93ae24e + 6de8d26
commit 1f8d569
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -9,6 +9,7 @@ on:
   pull_request:
 jobs:
   docker:
+    if: github.repository_owner == 'modrinth'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml
@@ -7,6 +7,7 @@ on:
 
 jobs:
   run-docker:
+    if: github.repository_owner == 'modrinth'
     runs-on: ubuntu-latest
 
     steps:

diff --git a/daedalus_client/library-patches.json b/daedalus_client/library-patches.json
@@ -2863,7 +2863,8 @@
   {
     "_comment": "Replace glfw from 3.3.1 with version from 3.3.2 to prevent stack smashing",
     "match": [
-      "org.lwjgl:lwjgl-glfw-natives-linux:3.3.1"
+      "org.lwjgl:lwjgl-glfw-natives-linux:3.3.1",
+      "org.lwjgl:lwjgl-glfw:3.3.1:natives-linux"
     ],
     "override": {
       "downloads": {
@@ -2876,4 +2877,4 @@
       "name": "org.lwjgl:lwjgl-glfw-natives-linux:3.3.2-lwjgl.1"
     }
   }
-]
+]
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,7 @@ on: @@
     jobs:
       run-docker:
+        if: github.repository_owner == 'modrinth'
         runs-on: ubuntu-latest
         steps:
@@ Expand Down @@