From 65040f007d60c82b7f498098cd1ead71d130f019 Mon Sep 17 00:00:00 2001
From: Timo Wilken <timo.wilken@cern.ch>
Date: Fri, 16 Feb 2024 14:58:22 +0100
Subject: [PATCH] Show linter warnings only for changed lines in PRs

---
 .github/workflows/recipe-checks.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/recipe-checks.yml b/.github/workflows/recipe-checks.yml
index e134ef139f..fc2f451362 100644
--- a/.github/workflows/recipe-checks.yml
+++ b/.github/workflows/recipe-checks.yml
@@ -28,15 +28,16 @@ jobs:
 
       - name: Run linter
         run: |
-          ! if [ -n "$BASE_SHA" ]; then
+          if [ -n "$BASE_SHA" ]; then
             # For pull requests, only check files that have changed relative to
             # the base commit.
-            git diff -z --diff-filter d --name-only "$BASE_SHA...$HEAD_SHA" -- '*.sh' |
-              xargs -0tr alidistlint -f github
+            merge_base=$(git merge-base "$BASE_SHA" "$HEAD_SHA")
+            git diff -z --diff-filter d --name-only "$merge_base..$HEAD_SHA" -- '*.sh' |
+              xargs -0tr alidistlint -f github --changes "$merge_base..$HEAD_SHA"
           else
-            # On push, check every file.
-            alidistlint -f github ./*.sh
-          fi | grep '^::error '
+            # On push, check every file, ignoring warnings and notes.
+            alidistlint -ef github ./*.sh
+          fi
         env:
           BASE_SHA: ${{ github.event.pull_request.base.sha }}
           HEAD_SHA: ${{ github.event.pull_request.head.sha || github.event.head_commit.sha }}
@@ -50,7 +51,7 @@ jobs:
         run: |
           sudo apt update -y
           sudo apt install -y graphviz
-          python3 -m pip install -U --user pyyaml alibuild
+          python3 -m pip install -U --user alibuild
           aliBuild analytics off
 
       - uses: actions/checkout@v3