From 8df20a372c0a7ee3ce536496af159c18156d5329 Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 12 Jun 2025 21:37:39 -0400 Subject: [PATCH 1/2] ci: don't run ci on custom in-tree branches This basically duplicates runs when a PR is opened from an in-tree branch. If we want to run one without a PR, we can use workflow_dispatch anyways Signed-off-by: Seth Flynn --- .github/workflows/build.yml | 5 +++-- .github/workflows/codeql.yml | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f4cdae97c..f744e28ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -2,8 +2,9 @@ name: Build on: push: - branches-ignore: - - "renovate/**" + branches: + - "develop" + - "release-*" paths: # File types - "**.cpp" diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index f8fae8ecf..8df64878b 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -2,6 +2,9 @@ name: "CodeQL Code Scanning" on: push: + branches: + - "develop" + - "release-*" paths: # File types - "**.cpp" From d8ac52bd8c97ea34d6a54613e27431d5f0fe93ee Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Thu, 12 Jun 2025 21:39:11 -0400 Subject: [PATCH 2/2] ci: ensure all workflows are actually run on push to branches Oops Signed-off-by: Seth Flynn --- .github/workflows/flatpak.yml | 3 +++ .github/workflows/nix.yml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index cab0edeb7..26a44d679 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -2,6 +2,9 @@ name: Flatpak on: push: + branches: + - "develop" + - "release-*" # We don't do anything with these artifacts on releases. They go to Flathub tags-ignore: - "*" diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 80b41161a..7b9412c87 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -2,6 +2,9 @@ name: Nix on: push: + branches: + - "develop" + - "release-*" tags: - "*" paths: