mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge master

This commit is contained in:
Eugene Zbiranik 2019-01-29 15:18:36 +03:00
parent 98bfb82787 d238e1feb3
commit 09b49d0145
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

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

4
.travis.yml
View File

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

3
README.md
View File

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

23
release.sh
View File

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