From a9cc1093caf0f502fad0a3be5f5e4bc7fc204c6b Mon Sep 17 00:00:00 2001
From: Joni Orponen <joni.orponen@rokki.ch>
Date: Sat, 5 Oct 2024 16:58:01 +0200
Subject: [PATCH] Unify all things CI to run on pull_request and merge_group.

---
 .github/workflows/pr-auto-merge.yml                           | 4 +++-
 .github/workflows/pr-dependabot-auto-approve.yml              | 4 +++-
 .../{push-format-python.yml => pr-format-python.yml}          | 4 +++-
 .../{push-lint-markdown.yml => pr-lint-markdown.yml}          | 4 +++-
 .../workflows/{push-lint-python.yml => pr-lint-python.yml}    | 4 +++-
 .../{push-lint-shellcheck.yml => pr-lint-shellcheck.yml}      | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)
 rename .github/workflows/{push-format-python.yml => pr-format-python.yml} (94%)
 rename .github/workflows/{push-lint-markdown.yml => pr-lint-markdown.yml} (94%)
 rename .github/workflows/{push-lint-python.yml => pr-lint-python.yml} (94%)
 rename .github/workflows/{push-lint-shellcheck.yml => pr-lint-shellcheck.yml} (91%)

diff --git a/.github/workflows/pr-auto-merge.yml b/.github/workflows/pr-auto-merge.yml
index c91a324..bade72a 100644
--- a/.github/workflows/pr-auto-merge.yml
+++ b/.github/workflows/pr-auto-merge.yml
@@ -1,6 +1,8 @@
 name: Auto Merge
 
-on: pull_request
+on:
+  pull_request:
+  merge_group:
 
 permissions:
   contents: write
diff --git a/.github/workflows/pr-dependabot-auto-approve.yml b/.github/workflows/pr-dependabot-auto-approve.yml
index 2b36e3a..d373e2c 100644
--- a/.github/workflows/pr-dependabot-auto-approve.yml
+++ b/.github/workflows/pr-dependabot-auto-approve.yml
@@ -1,6 +1,8 @@
 name: Dependabot Auto Approve
 
-on: pull_request
+on:
+  pull_request:
+  merge_group:
 
 permissions:
   pull-requests: write
diff --git a/.github/workflows/push-format-python.yml b/.github/workflows/pr-format-python.yml
similarity index 94%
rename from .github/workflows/push-format-python.yml
rename to .github/workflows/pr-format-python.yml
index ccc2a1f..5a9b95f 100644
--- a/.github/workflows/push-format-python.yml
+++ b/.github/workflows/pr-format-python.yml
@@ -1,6 +1,8 @@
 name: Check Python Formatting
 
-on: push
+on:
+  pull_request:
+  merge_group:
 
 jobs:
   ruff-format-check:
diff --git a/.github/workflows/push-lint-markdown.yml b/.github/workflows/pr-lint-markdown.yml
similarity index 94%
rename from .github/workflows/push-lint-markdown.yml
rename to .github/workflows/pr-lint-markdown.yml
index 6104015..779a317 100644
--- a/.github/workflows/push-lint-markdown.yml
+++ b/.github/workflows/pr-lint-markdown.yml
@@ -1,6 +1,8 @@
 name: Lint Markdown
 
-on: push
+on:
+  pull_request:
+  merge_group:
 
 jobs:
   markdown-lint:
diff --git a/.github/workflows/push-lint-python.yml b/.github/workflows/pr-lint-python.yml
similarity index 94%
rename from .github/workflows/push-lint-python.yml
rename to .github/workflows/pr-lint-python.yml
index 86c4a61..199e416 100644
--- a/.github/workflows/push-lint-python.yml
+++ b/.github/workflows/pr-lint-python.yml
@@ -1,6 +1,8 @@
 name: Lint Python
 
-on: push
+on:
+  pull_request:
+  merge_group:
 
 jobs:
   ruff-lint:
diff --git a/.github/workflows/push-lint-shellcheck.yml b/.github/workflows/pr-lint-shellcheck.yml
similarity index 91%
rename from .github/workflows/push-lint-shellcheck.yml
rename to .github/workflows/pr-lint-shellcheck.yml
index 313d8e1..317b7fc 100644
--- a/.github/workflows/push-lint-shellcheck.yml
+++ b/.github/workflows/pr-lint-shellcheck.yml
@@ -1,6 +1,8 @@
 name: Lint Shell Scripts
 
-on: push
+on:
+  pull_request:
+  merge_group:
 
 jobs:
   shellcheck-lint: