Merge branch 'main' into renovate/aiofiles-25.x

Author: l50

.github/workflows/pre-commit.yaml

@@ -18,8 +18,8 @@ on:
   workflow_dispatch:
 
 concurrency:
-  group: pre-commit-${{ github.run_id }}
   cancel-in-progress: true
+  group: pre-commit-${{ github.workflow }}-${{ github.ref }}
 
 env:
   PYTHON_VERSION: 3.12.6

.github/workflows/semgrep.yaml

@@ -16,8 +16,8 @@ on:
     - cron: "0 0 * * *" # Run daily at midnight UTC
 
 concurrency:
-  group: pre-commit-${{ github.run_id }}
   cancel-in-progress: true
+  group: semgrep-${{ github.workflow }}-${{ github.ref }}
 
 permissions:
   actions: read

.github/workflows/test.yaml

@@ -2,6 +2,7 @@
 name: Tests
 
 on:
+  merge_group:
   push:
     branches: [main]
     paths: