diff --git a/.github/workflows/differential-shellcheck.yml b/.github/workflows/differential-shellcheck.yml index fe26f763..1ebd0191 100644 --- a/.github/workflows/differential-shellcheck.yml +++ b/.github/workflows/differential-shellcheck.yml @@ -3,18 +3,18 @@ name: Differential ShellCheck on: push: + branches: [ main ] pull_request: branches: [ main ] merge_group: - branches: - - main + types: [ checks_requested ] permissions: contents: read jobs: lint: - name: Test latest changes + name: Differential ShellCheck - test current changes runs-on: ubuntu-latest permissions: @@ -46,9 +46,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/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 908d227c..990d7c11 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -6,6 +6,8 @@ on: branches: [ main ] push: branches: [ main ] + merge_group: + types: [ checks_requested ] permissions: contents: read diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 8dc4c84b..43b22841 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 @@ -225,7 +227,7 @@ * Bugfixes: * Make directory /github/workspace git-save - * Remove double quotes to avoid git empty pathspec warnings + * Remove double quotes to avoid `git` empty pathspec warnings * Make GA tests ran on current version of repo/fork * Bump actions/checkout from 2 to 3