Pull request 2179: upd-docker
Squashed commit of the following: commit 17e145c87b1fabde75d6dbe96570a1720a2e1306 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Mar 20 18:49:18 2024 +0300 bamboo-specs: upd builder img commit d6399a084b0e6b26cf27acc617838fdf7ea94e00 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Mar 20 18:35:01 2024 +0300 bamboo-specs: fix frontend build commit 9f4cbf5fd8f085e634ff021ab5320454856b3425 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Mar 20 18:21:50 2024 +0300 bamboo-specs: fix yaml commit a26d2ab063c23873e132e659ae4ba1035325ad3a Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Mar 20 18:18:57 2024 +0300 all: use new docker imgs
This commit is contained in:
15
Makefile
15
Makefile
@@ -82,8 +82,6 @@ build: deps quick-build
|
||||
|
||||
quick-build: js-build go-build
|
||||
|
||||
ci: deps test go-bench go-fuzz
|
||||
|
||||
deps: js-deps go-deps
|
||||
lint: js-lint go-lint
|
||||
test: js-test go-test
|
||||
@@ -98,15 +96,10 @@ build-release: $(BUILD_RELEASE_DEPS_$(FRONTEND_PREBUILT))
|
||||
clean: ; $(ENV) "$(SHELL)" ./scripts/make/clean.sh
|
||||
init: ; git config core.hooksPath ./scripts/hooks
|
||||
|
||||
js-build:
|
||||
$(NPM) $(NPM_FLAGS) run build-prod
|
||||
js-deps:
|
||||
$(NPM) $(NPM_INSTALL_FLAGS) ci
|
||||
|
||||
# TODO(a.garipov): Remove the legacy client tasks support once the new
|
||||
# client is done and the old one is removed.
|
||||
js-lint: ; $(NPM) $(NPM_FLAGS) run lint
|
||||
js-test: ; $(NPM) $(NPM_FLAGS) run test
|
||||
js-build: ; $(NPM) $(NPM_FLAGS) run build-prod
|
||||
js-deps: ; $(NPM) $(NPM_INSTALL_FLAGS) ci
|
||||
js-lint: ; $(NPM) $(NPM_FLAGS) run lint
|
||||
js-test: ; $(NPM) $(NPM_FLAGS) run test
|
||||
|
||||
go-bench: ; $(ENV) "$(SHELL)" ./scripts/make/go-bench.sh
|
||||
go-build: ; $(ENV) "$(SHELL)" ./scripts/make/go-build.sh
|
||||
|
||||
Reference in New Issue
Block a user