diff --git a/.github/labeler.yml b/.github/labeler.yml index d96566a2ed..121f4b734d 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -4,7 +4,6 @@ units: - units/**/* documentation: - NEWS - - man/* - docs/* network: - src/libsystemd-network/**/* @@ -17,8 +16,10 @@ selinux: apparmor: - '**/*apparmor*' meson: - - '**/meson.build' - meson_option.txt +mkosi: + - .mkosi/* + - mkosi.build busctl: - src/busctl/* systemctl: @@ -27,3 +28,12 @@ journal: - src/journal/* journal-remote: - src/journal-remote/* +portable: + - src/portable/**/* +resolve: + - src/resolve/* +timedate: + - src/timedate/* +timesync: + - src/timesync/* + - src/time-wait-sync/* diff --git a/test/run-integration-tests.sh b/test/run-integration-tests.sh index 04b8385be9..3c01adfca3 100755 --- a/test/run-integration-tests.sh +++ b/test/run-integration-tests.sh @@ -7,7 +7,7 @@ if [ $# -gt 0 ]; then else args="setup run clean-again" fi -args_no_clean=$(sed -r 's/\bclean\b//g' <<<$args) +args_no_clean=$(sed -r 's/\bclean.*\b//g' <<<$args) do_clean=$( [ "$args" = "$args_no_clean" ]; echo $? ) ninja -C "$BUILD_DIR" @@ -30,10 +30,10 @@ if [ $do_clean = 1 ]; then [ -n "$args_no_clean" ] || exit 0 fi -pass_blacklist() { - for marker in $BLACKLIST_MARKERS; do +pass_deny_list() { + for marker in $DENY_LIST_MARKERS $BLACKLIST_MARKERS; do if [ -f "$1/$marker" ]; then - echo "========== BLACKLISTED: $1 ($marker) ==========" + echo "========== DENY-LISTED: $1 ($marker) ==========" return 1 fi done @@ -43,7 +43,7 @@ pass_blacklist() { for TEST in TEST-??-* ; do COUNT=$(($COUNT+1)) - pass_blacklist $TEST || continue + pass_deny_list $TEST || continue start=$(date +%s) echo -e "\n--x-- Running $TEST --x--"