From 8d145f8990c813793648d292c285c3fbc0ad9f43 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Wed, 31 Jul 2024 15:27:59 +0200
Subject: [PATCH] ci: update Differential ShellCheck workflow

use default inputs when running on `merge_group`
---
 .github/workflows/differential-shellcheck.yml | 8 ++------
 docs/CHANGELOG.md                             | 2 ++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/differential-shellcheck.yml b/.github/workflows/differential-shellcheck.yml
index fe26f76..50011e4 100644
--- a/.github/workflows/differential-shellcheck.yml
+++ b/.github/workflows/differential-shellcheck.yml
@@ -6,15 +6,14 @@ on:
   pull_request:
     branches: [ main ]
   merge_group:
-    branches:
-      - main
+    branches: [ main ]
 
 permissions:
   contents: read
 
 jobs:
   lint:
-    name: Test latest changes
+    name: Differential ShellCheck - test current changes
     runs-on: ubuntu-latest
 
     permissions:
@@ -46,9 +45,6 @@ jobs:
             src/**.{zsh,osh}
           display-engine: sarif-fmt
           token: ${{ secrets.GITHUB_TOKEN }}
-          triggering-event: ${{ github.event_name == 'merge_group' && 'manual' || github.event_name }}
-          base: ${{ github.event.merge_group.base_sha }}
-          head: ${{ github.event.merge_group.head_sha }}
 
       - if: always()
         name: Upload artifact with defects in SARIF format
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 8dc4c84..ed0158e 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Next release
 
+* Native support for `merge_group` trigger event
+
 ## v5.3.1
 
 * Update `csutils` (`csdiff`) to 3.4.0