daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request: all: add bamboo specs

Browse Source 
Merge in DNS/adguard-home from add-specs to master

Squashed commit of the following:

commit 011f9ae643e84b9bcd407cba5d86c586a73f7366
Merge: 856364fb 80ed8be1
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 7 20:20:32 2021 +0300

    Merge branch 'master' into add-specs

commit 856364fb55901f977b6e25fa3cd90be5f680d3ad
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Apr 7 14:35:00 2021 +0300

    all: fix awk invocation

commit 202a04f5dd0860c094c887d7fdb71e6424a6d0ce
Merge: cdd95cfa 00a61fde
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 20:49:05 2021 +0300

    Merge branch 'master' into add-specs

commit cdd95cfa4e6be74acd4d15a2908504e9e27f29d8
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 18:03:55 2021 +0300

    all: fix specs

commit fe2a3017f5c88d429ca6f962dee293338d55919f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 17:30:45 2021 +0300

    all: use the correct gpg key

commit a28eff00f7a98a078e34c2b16e887c05364b6087
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 17:14:28 2021 +0300

    all: imp Makefile, specs

commit 6faa3c0687387e4fd60433d326a99da01dd21b02
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Apr 6 16:50:41 2021 +0300

    all: add bamboo specs
This commit is contained in:
Ainar Garipov
2021-04-08 13:55:12 +03:00
parent 80ed8be145
commit 1c87dc577d
7 changed files with 320 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@@ -15,12 +15,17 @@ GPG_KEY = devteam@adguard.com
GPG_KEY_PASSPHRASE = not-a-real-password
NPM = npm
NPM_FLAGS = --prefix $(CLIENT_DIR)
NPM_INSTALL_FLAGS = $(NPM_FLAGS) --quiet --no-progress --ignore-engines\
--ignore-optional --ignore-platform --ignore-scripts
RACE = 0
SIGN = 1
VERBOSE = 0
VERSION = v0.0.0
YARN = yarn
YARN_FLAGS = --cwd $(CLIENT_BETA_DIR) --network-timeout 120000
YARN_FLAGS = --cwd $(CLIENT_BETA_DIR)
YARN_INSTALL_FLAGS = $(YARN_FLAGS) --network-timeout 120000 --silent\
--ignore-engines --ignore-optional --ignore-platform\
--ignore-scripts
ENV = env\
COMMIT='$(COMMIT)'\
@@ -64,8 +69,8 @@ js-build:
$(NPM) $(NPM_FLAGS) run build-prod
$(YARN) $(YARN_FLAGS) build
js-deps:
$(NPM) $(NPM_FLAGS) ci
$(YARN) $(YARN_FLAGS) install
$(NPM) $(NPM_INSTALL_FLAGS) ci
$(YARN) $(YARN_INSTALL_FLAGS) install
# TODO(a.garipov): Remove the legacy client tasks support once the new
# client is done and the old one is removed.