Pull request: dnsfilter: restore enum value
Merge in DNS/adguard-home from fix-filter-names to master Squashed commit of the following: commit 620d80df12878a1b236abb26cd2a331df998a3d5 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Dec 14 20:02:41 2020 +0300 dnsfilter: restore enum value
This commit is contained in:
parent
0cddf4c11d
commit
a2d39c810a
@ -1,18 +1,13 @@
|
|||||||
#!/bin/bash
|
#!/bin/sh
|
||||||
set -e;
|
|
||||||
|
|
||||||
found=0
|
set -e -f -u
|
||||||
git diff --cached --name-only | grep -q '.js$' && found=1
|
|
||||||
if [ $found == 1 ]; then
|
if [ "$(git diff --cached --name-only '*.js')" ]
|
||||||
npm --prefix client run lint || exit 1
|
then
|
||||||
npm run test --prefix client || exit 1
|
make js-lint js-test
|
||||||
fi
|
fi
|
||||||
|
|
||||||
found=0
|
if [ "$(git diff --cached --name-only '*.go')" ]
|
||||||
git diff --cached --name-only | grep -q '.go$' && found=1
|
then
|
||||||
if [ $found == 1 ]; then
|
make go-lint go-test
|
||||||
make go-lint || exit 1
|
|
||||||
go test ./... || exit 1
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
exit 0;
|
|
||||||
|
@ -129,6 +129,9 @@ const (
|
|||||||
NotFilteredNotFound Reason = iota
|
NotFilteredNotFound Reason = iota
|
||||||
// NotFilteredWhiteList - the host is explicitly whitelisted
|
// NotFilteredWhiteList - the host is explicitly whitelisted
|
||||||
NotFilteredWhiteList
|
NotFilteredWhiteList
|
||||||
|
// NotFilteredError is return where there was an error during
|
||||||
|
// checking. Reserved, currently unused.
|
||||||
|
NotFilteredError
|
||||||
|
|
||||||
// reasons for filtering
|
// reasons for filtering
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user