a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request: all: fix gpg_key, release 

Merge in DNS/adguard-home from 2276-fix-release to master

Updates #2276.

Squashed commit of the following:

commit d7b4af6aa867159c5ced8b421a20606f5ee11fd6
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 30 20:26:33 2020 +0300

    all: remove comment

commit cd779699159c4efee4b64184b331add94a7ba57e
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Dec 30 20:25:24 2020 +0300

    all: fix gpg_key, release
This commit is contained in:
Ainar Garipov 2020-12-30 20:36:57 +03:00
parent 0e84962fde
commit e20e94ddd4
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -15,6 +15,7 @@ GO = go
# #
# GOPROXY = https://goproxy.io|https://goproxy.cn|direct # GOPROXY = https://goproxy.io|https://goproxy.cn|direct
GOPROXY = https://goproxy.cn,https://goproxy.io,direct GOPROXY = https://goproxy.cn,https://goproxy.io,direct
GPG_KEY = devteam@adguard.com
GPG_KEY_PASSPHRASE = not-a-real-password GPG_KEY_PASSPHRASE = not-a-real-password
NPM = npm NPM = npm
NPM_FLAGS = --prefix $(CLIENT_DIR) NPM_FLAGS = --prefix $(CLIENT_DIR)
@ -27,6 +28,7 @@ YARN_FLAGS = --cwd $(CLIENT_BETA_DIR)
ENV = env\ ENV = env\
COMMIT='$(COMMIT)'\ COMMIT='$(COMMIT)'\
CHANNEL='$(CHANNEL)'\ CHANNEL='$(CHANNEL)'\
GPG_KEY='$(GPG_KEY)'\
GPG_KEY_PASSPHRASE='$(GPG_KEY_PASSPHRASE)'\ GPG_KEY_PASSPHRASE='$(GPG_KEY_PASSPHRASE)'\
DIST_DIR='$(DIST_DIR)'\ DIST_DIR='$(DIST_DIR)'\
GO='$(GO)'\ GO='$(GO)'\

1
scripts/make/build-release.sh
View File

@ -101,6 +101,7 @@ freebsd amd64 0 0 0
freebsd arm 5 0 0 freebsd arm 5 0 0
freebsd arm 6 0 0 freebsd arm 6 0 0
freebsd arm 7 0 0 freebsd arm 7 0 0
freebsd arm64 0 0 0
linux 386 0 0 i386 linux 386 0 0 i386
linux amd64 0 0 amd64 linux amd64 0 0 amd64
linux arm 5 0 0 linux arm 5 0 0