Remove deleted rulesets from whitelist (EFForg#18967)

zoracon · web-flow · commit a207be5b6141 · 2020-03-05T10:11:00.000-08:00
* Remove deleted rulesets from whitelist Related to EFForg#18966 * Run ruleset-whitelist-cleanup.sh * utils/ruleset-whitelist-cleanup.sh: Set exit code Related to EFForg#18966 * run_travis.sh: Add whitelist update to validations Closes EFForg#18966
diff --git a/test/run_travis.sh b/test/run_travis.sh
@@ -75,6 +75,8 @@ elif [ "$TEST" == "validations" ] || [ "$TEST" == "fetch" ] || [ "$TEST" == "pre
     if [ "$TEST" == "validations" ]; then
       echo >&2 "Performing validations on rulesets."
       docker run --rm -ti -v $(pwd):/opt httpse bash -c "test/validations.sh"
+      echo >&2 "Checking ruleset whitelist is updated if necessary."
+      utils/ruleset-whitelist-cleanup.sh
     fi
 
     if [ "$TEST" == "fetch" ]; then
diff --git a/utils/ruleset-whitelist-cleanup.sh b/utils/ruleset-whitelist-cleanup.sh
@@ -40,3 +40,4 @@ done) < "$WLIST"
 TMPFILE=`mktemp`
 (head -n1 "$WLIST" && tail -n +2 "$WLIST" | sort -t"," -b -u -k4) > "$TMPFILE"
 mv "$TMPFILE" "$WLIST"
+git diff --exit-code --no-patch "$WLIST"
diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv
