Merge master

.gitignore

@@ -2,9 +2,11 @@
 /.vscode
 /.idea
 /AdGuardHome
+/AdGuardHome.exe
 /AdGuardHome.yaml
 /data/
 /build/
+/dist/
 /client/node_modules/
 /querylog.json
 /querylog.json.1
@@ -13,4 +15,4 @@
 
 # Test output
 dnsfilter/tests/top-1m.csv
-dnsfilter/tests/dnsfilter.TestLotsOfRules*.pprof
+dnsfilter/tests/dnsfilter.TestLotsOfRules*.pprof

.travis.yml

@@ -78,6 +78,4 @@ matrix:
         - docker login -u="$DOCKER_USER" -p="$DOCKER_PASSWORD"
         - ./build_docker.sh
       after_script:
-        - docker images
-    
-    
+        - docker images    

README.md

@@ -23,6 +23,9 @@
     <a href="https://goreportcard.com/report/AdguardTeam/AdGuardHome">
       <img src="https://goreportcard.com/badge/github.com/AdguardTeam/AdGuardHome" alt="Go Report Card" />
     </a>
+    <a href="https://golangci.com/r/github.com/AdguardTeam/AdGuardHome">
+      <img src="https://golangci.com/badges/github.com/AdguardTeam/AdGuardHome.svg" alt="GolangCI" />
+    </a>
     <a href="https://github.com/AdguardTeam/AdGuardHome/releases">
         <img src="https://img.shields.io/github/release/AdguardTeam/AdGuardHome/all.svg" alt="Latest release" />
     </a>

release.sh

@@ -9,23 +9,26 @@ version=`git describe --abbrev=4 --dirty --always --tags`
 f() {
 	make cleanfast; CGO_DISABLED=1 make
 	if [[ $GOOS == darwin ]]; then
-	    rm -f ../AdGuardHome_"$version"_MacOS.zip
-	    zip ../AdGuardHome_"$version"_MacOS.zip AdGuardHome README.md LICENSE.TXT
+	    zip dist/AdGuardHome_"$version"_MacOS.zip AdGuardHome README.md LICENSE.txt
 	elif [[ $GOOS == windows ]]; then
-	    rm -f ../AdGuardHome_"$version"_Windows.zip
-	    zip ../AdGuardHome_"$version"_Windows.zip AdGuardHome.exe README.md LICENSE.TXT
+	    zip dist/AdGuardHome_"$version"_Windows.zip AdGuardHome.exe README.md LICENSE.txt
 	else
-	    pushd ..
-	    tar zcvf AdGuardHome_"$version"_"$GOOS"_"$GOARCH".tar.gz AdGuardHome/{AdGuardHome,LICENSE.TXT,README.md}
-	    popd
+	    tar zcvf dist/AdGuardHome_"$version"_"$GOOS"_"$GOARCH".tar.gz AdGuardHome README.md LICENSE.txt
 	fi
 }
 
-#make clean
-#make
+# Clean and rebuild both static and binary
+make clean
+make
+
+# Prepare the dist folder
+rm -rf dist
+mkdir -p dist
+
+# Prepare releases
 GOOS=darwin GOARCH=amd64 f
 GOOS=linux GOARCH=amd64 f
 GOOS=linux GOARCH=386 f
 GOOS=linux GOARCH=arm GOARM=6 f
 GOOS=linux GOARCH=arm64 GOARM=6 f
-GOOS=windows GOARCH=amd64 f
+GOOS=windows GOARCH=amd64 f