Skip to content

Commit b0d67b6

Browse files
committed
ci: build: Add renamed files to diff-filter
Modified files that were also renamed are Renamed under diff-filter, e.g.: M: zynq-coraz7s.dts (+10,-1) R: zynq-coraz7s-fpga-eeprom.dts → zynq-coraz7s-no-bitstream.dts (-20) Signed-off-by: Jorge Marques <jorge.marques@analog.com>
1 parent 1a11321 commit b0d67b6

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

ci/build.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ check_checkpatch() {
1414
git --no-pager show --format="%h %s" "$commit" --name-only
1515
# Skip empty commits, assume cover letter
1616
# and those only touching non-upstream directories .github ci and docs
17-
local files=$(git diff --diff-filter=ACM --name-only $commit~..$commit | grep -v ^ci | grep -v ^.github | grep -v ^docs || true)
17+
local files=$(git diff --diff-filter=ACMR --name-only $commit~..$commit | grep -v ^ci | grep -v ^.github | grep -v ^docs || true)
1818
if [[ -z "$files" ]]; then
1919
echo "empty, skipped"
2020
continue
@@ -330,7 +330,7 @@ compile_devicetree() {
330330

331331
echo "compile devicetree on range $base_sha..$head_sha"
332332

333-
local dtsi_files=$(git diff --diff-filter=ACM --name-only $base_sha..$head_sha | grep ^arch/$ARCH/boot/dts/ | grep dtsi$ || true)
333+
local dtsi_files=$(git diff --diff-filter=ACMR --name-only $base_sha..$head_sha | grep ^arch/$ARCH/boot/dts/ | grep dtsi$ || true)
334334
if [[ ! -z "$dtsi_files" ]]; then
335335
echo "collecting dts files that include dtsi"
336336
while read file; do
@@ -348,7 +348,7 @@ compile_devicetree() {
348348
dts_files=${dts_files::-1}
349349
fi
350350

351-
dts_files+=$(git diff --diff-filter=ACM --name-only $base_sha..$head_sha | grep ^arch/$ARCH/boot/dts/ | grep dts$ || true)
351+
dts_files+=$(git diff --diff-filter=ACMR --name-only $base_sha..$head_sha | grep ^arch/$ARCH/boot/dts/ | grep dts$ || true)
352352
if [[ -z "$dts_files" ]]; then
353353
echo "no dts on range, skipped"
354354
return $err
@@ -641,7 +641,7 @@ compile_kernel_smatch() {
641641
}
642642

643643
compile_gcc_fanalyzer () {
644-
local files=$(git diff --diff-filter=ACM --name-only $base_sha..$head_sha)
644+
local files=$(git diff --diff-filter=ACMR --name-only $base_sha..$head_sha)
645645
local regex='^[[:alnum:]/._-]+:[[:digit:]]+:[[:digit:]]+: .*$'
646646
local mail=
647647
local fail=0
@@ -728,7 +728,7 @@ compile_gcc_fanalyzer () {
728728
}
729729

730730
compile_clang_analyzer () {
731-
local files=$(git diff --diff-filter=ACM --name-only $base_sha..$head_sha)
731+
local files=$(git diff --diff-filter=ACMR --name-only $base_sha..$head_sha)
732732
local regex='^[[:alnum:]/._-]+:[[:digit:]]+:[[:digit:]]+: .*$'
733733
local mail=
734734
local fail=0
@@ -823,7 +823,7 @@ compile_clang_analyzer () {
823823
}
824824

825825
assert_compiled () {
826-
local files=$(git diff --diff-filter=ACM --name-only $base_sha..$head_sha)
826+
local files=$(git diff --diff-filter=ACMR --name-only $base_sha..$head_sha)
827827
local fail=0
828828

829829
echo "assert sources were compiled on range $base_sha..$head_sha"
@@ -862,7 +862,7 @@ apply_prerun() {
862862
# e.g. manipulate the source code depending on run conditons or target.
863863
local coccis=$(ls ci/prerun/*.cocci 2>/dev/null)
864864
local bashes=$(ls ci/prerun/*.sh 2>/dev/null)
865-
local files=$(git diff --diff-filter=ACM --name-only $base_sha..$head_sha)
865+
local files=$(git diff --diff-filter=ACMR --name-only $base_sha..$head_sha)
866866

867867
echo "apply_prerun on range $base_sha..$head_sha"
868868

@@ -891,13 +891,13 @@ apply_prerun() {
891891
}
892892

893893
touch_files () {
894-
local files=$(git diff --diff-filter=ACM --name-only $base_sha..$head_sha)
894+
local files=$(git diff --diff-filter=ACMR --name-only $base_sha..$head_sha)
895895

896896
touch $files
897897
}
898898

899899
auto_set_kconfig() {
900-
local files=$(git diff --diff-filter=ACM --name-only $base_sha..$head_sha)
900+
local files=$(git diff --diff-filter=ACMR --name-only $base_sha..$head_sha)
901901
declare -a o_files
902902

903903
echo "get_kconfig on range $base_sha..$head_sha"

0 commit comments

Comments
 (0)