Merge branch 'gfx-rs:trunk' into trunk

gfx-rs · Jan 10, 2025 · 22d312f · 22d312f
2 parents b6081bf + 450ac2d
commit 22d312f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
       # CI is running on the merge queue, so we don't need to run on trunk at all.
       "trunk",
       # This is the branch the merge queue creates.
-      "gh-readonly-queue/*"
+      "gh-readonly-queue/**"
     ]
     tags: [v0.*]
   pull_request:

diff --git a/.github/workflows/shaders.yml b/.github/workflows/shaders.yml
@@ -6,7 +6,7 @@ on:
       # CI is running on the merge queue, so we don't need to run on trunk at all.
       "trunk",
       # This is the branch the merge queue creates.
-      "gh-readonly-queue/*"
+      "gh-readonly-queue/**"
     ]
     tags: [v0.*]
   pull_request: