From e20e94ddd47645e9aec30d623e963eb55c82a57c Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Wed, 30 Dec 2020 20:36:57 +0300
Subject: [PATCH] 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
---
Makefile | 2 ++
scripts/make/build-release.sh | 1 +
2 files changed, 3 insertions(+)
diff --git a/Makefile b/Makefile
index d9ce026d..246a7c55 100644
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,7 @@ GO = go
#
# GOPROXY = https://goproxy.io|https://goproxy.cn|direct
GOPROXY = https://goproxy.cn,https://goproxy.io,direct
+GPG_KEY = devteam@adguard.com
GPG_KEY_PASSPHRASE = not-a-real-password
NPM = npm
NPM_FLAGS = --prefix $(CLIENT_DIR)
@@ -27,6 +28,7 @@ YARN_FLAGS = --cwd $(CLIENT_BETA_DIR)
ENV = env\
COMMIT='$(COMMIT)'\
CHANNEL='$(CHANNEL)'\
+ GPG_KEY='$(GPG_KEY)'\
GPG_KEY_PASSPHRASE='$(GPG_KEY_PASSPHRASE)'\
DIST_DIR='$(DIST_DIR)'\
GO='$(GO)'\
diff --git a/scripts/make/build-release.sh b/scripts/make/build-release.sh
index e031d049..848da099 100644
--- a/scripts/make/build-release.sh
+++ b/scripts/make/build-release.sh
@@ -101,6 +101,7 @@ freebsd amd64 0 0 0
freebsd arm 5 0 0
freebsd arm 6 0 0
freebsd arm 7 0 0
+freebsd arm64 0 0 0
linux 386 0 0 i386
linux amd64 0 0 amd64
linux arm 5 0 0