From a2b08b5cbfb655d853a92f845d7e93e6b4031456 Mon Sep 17 00:00:00 2001 From: Ilya Lipnitskiy Date: Tue, 23 Feb 2021 21:06:21 -0800 Subject: [PATCH] CI: enhance package detection logic Signed-off-by: Ilya Lipnitskiy --- .github/workflows/multi-arch-test-build.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/multi-arch-test-build.yml b/.github/workflows/multi-arch-test-build.yml index 20187622b0..249efff33b 100644 --- a/.github/workflows/multi-arch-test-build.yml +++ b/.github/workflows/multi-arch-test-build.yml @@ -34,10 +34,18 @@ jobs: - name: Determine changed packages run: | - # only detect packages with changed Makefiles - PACKAGES="$(git diff --diff-filter=d --name-only origin/master \ - | grep -E 'Makefile$|test.sh$' | grep -Ev '/files/|/src/' \ - | awk -F/ '{ print $(NF-1) }' | tr '\n' ' ')" + # only detect packages with changes + PKG_ROOTS=$(find . -name Makefile | grep -v ".*/src/Makefile" | sed -e 's@./\(.*\)/Makefile@\1/@') + CHANGES=$(git diff --diff-filter=d --name-only origin/master) + + for ROOT in $PKG_ROOTS; do + for CHANGE in $CHANGES; do + if [[ "$CHANGE" == "$ROOT"* ]]; then + PACKAGES+=$(echo "$ROOT" | sed -e 's@.*/\(.*\)/@\1 @') + break + fi + done + done # fallback to test packages if nothing explicitly changes this is # should run if other mechanics in packages.git changed