[MM-56017] Remove prereq-check.sh redantant script from Make (#25529)
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
ff01fe2722
Коммит
c441f536b8
@@ -17,9 +17,9 @@ else
|
||||
export IS_LINUX =
|
||||
endif
|
||||
|
||||
# Detect M1/M2 Macs and set a flag.
|
||||
# Detect Apple Silicon and set a flag.
|
||||
ifeq ($(shell uname)/$(shell uname -m),Darwin/arm64)
|
||||
M1_MAC = true
|
||||
ARM_BASED_MAC = true
|
||||
endif
|
||||
|
||||
define LICENSE_HEADER
|
||||
@@ -202,8 +202,8 @@ ifneq ("$(wildcard ./docker-compose.override.yaml)","")
|
||||
DOCKER_COMPOSE_OVERRIDE=-f docker-compose.override.yaml
|
||||
endif
|
||||
|
||||
ifeq ($(M1_MAC),true)
|
||||
$(info M1 detected, applying elasticsearch override)
|
||||
ifeq ($(ARM_BASED_MAC),true)
|
||||
$(info Apple Silicon detected, applying elasticsearch override)
|
||||
DOCKER_COMPOSE_OVERRIDE := -f docker-compose.makefile.m1.yml $(DOCKER_COMPOSE_OVERRIDE)
|
||||
endif
|
||||
|
||||
@@ -390,9 +390,6 @@ layers: app-layers store-layers pluginapi
|
||||
|
||||
generated: mocks layers
|
||||
|
||||
check-prereqs: ## Checks prerequisite software status.
|
||||
./scripts/prereq-check.sh
|
||||
|
||||
check-prereqs-enterprise: setup-go-work ## Checks prerequisite software status for enterprise.
|
||||
ifeq ($(BUILD_ENTERPRISE_READY),true)
|
||||
./scripts/prereq-check-enterprise.sh
|
||||
@@ -623,7 +620,7 @@ run-client-fullmap: client ## Legacy alias to run-client
|
||||
|
||||
cd $(BUILD_WEBAPP_DIR) && $(MAKE) run
|
||||
|
||||
run: check-prereqs run-server run-client ## Runs the server and webapp.
|
||||
run: run-server run-client ## Runs the server and webapp.
|
||||
|
||||
run-fullmap: run-server run-client ## Legacy alias to run
|
||||
|
||||
|
||||
Ссылка в новой задаче
Block a user