From 543535e0763a60acf7afff2ebcfc2ca2b7cfb832 Mon Sep 17 00:00:00 2001 From: Michel Jouvin Date: Wed, 6 Nov 2024 18:27:47 +0100 Subject: [PATCH] CI scripts (panlint/indent): exclude deleted files - Also update create-vanilla-SCDB options with the new --continuous-integration option --- .ci-scripts/indent | 2 +- .ci-scripts/panlint | 2 +- .ci-scripts/test-library | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci-scripts/indent b/.ci-scripts/indent index 4bf7cb07..6524e127 100755 --- a/.ci-scripts/indent +++ b/.ci-scripts/indent @@ -5,4 +5,4 @@ rm -f /tmp/indent.py wget -q https://raw.githubusercontent.com/stfc/Pan-Indenter/master/pan_indent_checker.py -O /tmp/indent.py chmod u+x /tmp/indent.py -git diff --name-only HEAD^ | grep '\.pan$' | xargs -rn1 /tmp/indent.py check || exit 1 +git diff --name-only --diff-filter=d HEAD^ | grep '\.pan$' | xargs -rn1 /tmp/indent.py check || exit 1 diff --git a/.ci-scripts/panlint b/.ci-scripts/panlint index b7ba1429..fdb53b05 100755 --- a/.ci-scripts/panlint +++ b/.ci-scripts/panlint @@ -5,4 +5,4 @@ rm -f /tmp/panlint.py wget -q https://raw.githubusercontent.com/quattor/pan/master/panc/src/main/scripts/panlint/panlint.py -O /tmp/panlint.py chmod u+x /tmp/panlint.py -git diff --name-only HEAD^ | grep '\.pan$' | xargs -r /tmp/panlint.py || exit 1 +git diff --name-only --diff-filter=d HEAD^ | grep '\.pan$' | xargs -r /tmp/panlint.py || exit 1 diff --git a/.ci-scripts/test-library b/.ci-scripts/test-library index edf6bf9e..6bb5bec7 100755 --- a/.ci-scripts/test-library +++ b/.ci-scripts/test-library @@ -8,4 +8,4 @@ rm -f /tmp/create-vanilla-SCDB.sh wget -q https://raw.githubusercontent.com/quattor/scdb/master/utils/scdb/create-vanilla-SCDB.sh -O /tmp/create-vanilla-SCDB.sh chmod u+x /tmp/create-vanilla-SCDB.sh -/tmp/create-vanilla-SCDB.sh -F --debug --continuous-integration HEAD +/tmp/create-vanilla-SCDB.sh -F --continuous-integration HEAD