From 2088645b69b439c7a6100fd7b50de8e1b04f0338 Mon Sep 17 00:00:00 2001 From: Connor Fitzgerald Date: Fri, 10 Jan 2025 13:16:59 -0500 Subject: [PATCH] Fix Double Push (#6889) --- .github/workflows/ci.yml | 7 ++++++- .github/workflows/shaders.yml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4778b43362..9cab7bd7cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,7 +2,12 @@ name: CI on: push: - branches-ignore: ["trunk"] + branches-ignore: [ + # 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/*" + ] tags: [v0.*] pull_request: merge_group: diff --git a/.github/workflows/shaders.yml b/.github/workflows/shaders.yml index 5d1369ae9d..0920281b61 100644 --- a/.github/workflows/shaders.yml +++ b/.github/workflows/shaders.yml @@ -2,7 +2,12 @@ name: Shaders on: push: - branches-ignore: ["trunk"] + branches-ignore: [ + # 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/*" + ] tags: [v0.*] pull_request: merge_group: