mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-21 20:45:33 +03:00
fc9ddcf941
Merge in DNS/adguard-home from 1383-client-id to master Updates #1383. Squashed commit of the following: commit ebe2678bfa9bf651a2cb1e64499b38edcf19a7ad Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:51:59 2021 +0300 - client: check if IP is valid commit 0c330585a170ea149ee75e43dfa65211e057299c Author: Ildar Kamalov <ik@adguard.com> Date: Wed Jan 27 17:07:50 2021 +0300 - client: find clients by client_id commit 71c9593ee35d996846f061e114b7867c3aa3c978 Merge: 9104f1613e9edd9eAuthor: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 16:09:45 2021 +0300 Merge branch 'master' into 1383-client-id commit 9104f1615d2d462606c52017df25a422df872cea Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 13:28:50 2021 +0300 dnsforward: imp tests commit ed47f26e611ade625a2cc2c2f71a291b796bbf8f Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Jan 27 12:39:52 2021 +0300 dnsforward: fix address commit 98b222ba69a5d265f620c180c960d01c84a1fb3b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:50:31 2021 +0300 home: imp code commit 4f3966548a2d8437d0b68207dd108dd1a6cb7d20 Merge: 199fdc05c215b820Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:45:13 2021 +0300 Merge branch 'master' into 1383-client-id commit 199fdc056f8a8be5500584f3aaee32865188aedc Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 19:20:37 2021 +0300 all: imp tests, logging, etc commit 35ff14f4d534251aecb2ea60baba225f3eed8a3e Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:55:19 2021 +0300 + client: remove block button from clients with client_id commit 32991a0b4c56583a02fb5e00bba95d96000bce20 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Jan 26 18:54:25 2021 +0300 + client: add requests count for client_id commit 2d68df4d2eac4a296d7469923e601dad4575c1a1 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 15:49:50 2021 +0300 stats: handle client ids commit 4e14ab3590328f93a8cd6e9cbe1665baf74f220b Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:45:25 2021 +0300 openapi: fix example commit ca9cf3f744fe197cace2c28ddc5bc68f71dad1f3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:37:10 2021 +0300 openapi: improve clients find api docs commit f79876e550c424558b704bc316a4cd04f25db011 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Jan 26 13:18:52 2021 +0300 home: accept ids in clients find commit 5b72595122aa0bd64debadfd753ed8a0e0840629 Merge: 607e241fabf8f65fAuthor: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:34:56 2021 +0300 Merge branch 'master' into 1383-client-id commit 607e241f1c339dd6397218f70b8301e3de6a1ee0 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 18:30:39 2021 +0300 dnsforward: fix quic commit f046352fef93e46234c2bbe8ae316d21034260e5 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Jan 25 16:53:09 2021 +0300 all: remove wildcard requirement commit 3b679489bae82c54177372be453fe184d8f0bab6 Author: Andrey Meshkov <am@adguard.com> Date: Mon Jan 25 16:02:28 2021 +0300 workDir now supports symlinks commit 0647ab4f113de2223f6949df001f42ecab05c995 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:59:46 2021 +0300 - client: remove wildcard from domain validation commit b1aec04a4ecadc9d65648ed6d284188fecce01c3 Author: Ildar Kamalov <ik@adguard.com> Date: Mon Jan 25 14:55:39 2021 +0300 + client: add form to download mobileconfig ... and 12 more commits
101 lines
2.7 KiB
Makefile
101 lines
2.7 KiB
Makefile
# Keep the Makefile POSIX-compliant. We currently allow hyphens in
|
|
# target names, but that may change in the future.
|
|
#
|
|
# See https://pubs.opengroup.org/onlinepubs/9699919799/utilities/make.html.
|
|
.POSIX:
|
|
|
|
CHANNEL = development
|
|
CLIENT_BETA_DIR = client2
|
|
CLIENT_DIR = client
|
|
COMMIT = $$(git rev-parse --short HEAD)
|
|
DIST_DIR = dist
|
|
GO = go
|
|
# TODO(a.garipov): Add more default proxies using pipes after update to
|
|
# Go 1.15.
|
|
#
|
|
# 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)
|
|
SIGN = 1
|
|
VERBOSE = 0
|
|
VERSION = v0.0.0
|
|
YARN = yarn
|
|
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)'\
|
|
GOPROXY='$(GOPROXY)'\
|
|
PATH="$${PWD}/bin:$$($(GO) env GOPATH)/bin:$${PATH}"\
|
|
SIGN='$(SIGN)'\
|
|
VERBOSE='$(VERBOSE)'\
|
|
VERSION='$(VERSION)'\
|
|
|
|
# Keep the line above blank.
|
|
|
|
# Keep this target first, so that a naked make invocation triggers
|
|
# a full build.
|
|
build: deps quick-build
|
|
|
|
quick-build: js-build go-build
|
|
|
|
ci: deps test
|
|
|
|
deps: js-deps go-deps
|
|
lint: js-lint go-lint
|
|
test: js-test go-test
|
|
|
|
# Here and below, keep $(SHELL) in quotes, because on Windows this will
|
|
# expand to something like "C:/Program Files/Git/usr/bin/sh.exe".
|
|
build-docker: ; $(ENV) "$(SHELL)" ./scripts/make/build-docker.sh
|
|
|
|
build-release: deps js-build
|
|
$(ENV) "$(SHELL)" ./scripts/make/build-release.sh
|
|
|
|
clean: ; $(ENV) "$(SHELL)" ./scripts/make/clean.sh
|
|
init: ; git config core.hooksPath ./scripts/hooks
|
|
|
|
js-build:
|
|
$(NPM) $(NPM_FLAGS) run build-prod
|
|
$(YARN) $(YARN_FLAGS) build
|
|
js-deps:
|
|
$(NPM) $(NPM_FLAGS) ci
|
|
$(YARN) $(YARN_FLAGS) install
|
|
js-lint:
|
|
$(NPM) $(NPM_FLAGS) run lint
|
|
$(YARN) $(YARN_FLAGS) lint
|
|
js-test:
|
|
$(NPM) $(NPM_FLAGS) run test
|
|
|
|
go-build: ; $(ENV) "$(SHELL)" ./scripts/make/go-build.sh
|
|
go-deps: ; $(ENV) "$(SHELL)" ./scripts/make/go-deps.sh
|
|
go-lint: ; $(ENV) "$(SHELL)" ./scripts/make/go-lint.sh
|
|
go-test: ; $(ENV) "$(SHELL)" ./scripts/make/go-test.sh
|
|
go-tools: ; $(ENV) "$(SHELL)" ./scripts/make/go-tools.sh
|
|
|
|
go-check: go-tools go-lint go-test
|
|
|
|
openapi-lint: ; cd ./openapi/ && $(YARN) test
|
|
openapi-show: ; cd ./openapi/ && $(YARN) start
|
|
|
|
# TODO(a.garipov): Remove the legacy targets once the build
|
|
# infrastructure stops using them.
|
|
dependencies:
|
|
@ echo "use make deps instead"
|
|
@ $(MAKE) deps
|
|
docker-multi-arch:
|
|
@ echo "use make build-docker instead"
|
|
@ $(MAKE) build-docker
|
|
go-install-tools:
|
|
@ echo "use make go-tools instead"
|
|
@ $(MAKE) go-tools
|
|
release:
|
|
@ echo "use make build-release instead"
|
|
@ $(MAKE) build-release
|