[MM-56017] Remove prereq-check.sh redantant script from Make (#25529)

This commit is contained in:
M-ZubairAhmed 2023-12-02 17:50:15 +05:30 committed by GitHub
parent ff01fe2722
commit c441f536b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 57 deletions

View File

@ -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

View File

@ -1,49 +0,0 @@
#!/bin/bash
check_version()
{
local version=$1 check=$2
local winner=$(echo -e "$version\n$check" | sed '/^$/d' | sort -t. -s -k 1,1nr -k 2,2nr -k 3,3nr -k 4,4nr | head -1)
[[ "$winner" = "$version" ]] && return 0
return 1
}
check_prereq()
{
if [ ! $# == 3 ]; then
echo "Unable to determine '$1' version! Ensure that '$1' is in your path and try again." && exit 1
fi
local dependency=$1 required_version=$2 installed_version=$3
type $dependency >/dev/null 2>&1 || { echo >&2 "Mattermost requires '$dependency' but it doesn't appear to be installed. Aborting."; exit 1; }
if check_version $installed_version $required_version; then
echo "$dependency minimum requirement met. Required: $required_version, Found: $installed_version"
else
echo "WARNING! Mattermost did not find the minimum supported version of '$dependency' installed. Required: $required_version, Found: $installed_version"
echo "We highly recommend stopping installation and updating dependencies before continuing"
read -p "Enter Y to continue anyway (not recommended)." -n 1 -r
echo
if [[ ! $REPLY =~ ^[Yy]$ ]]
then
exit 1
fi
fi
}
echo "Checking prerequisites"
REQUIREDNODEVERSION=16.0.0
REQUIREDNPMVERSION=7.10.0
REQUIREDGOVERSION=1.18.0
REQUIREDDOCKERVERSION=17.0
NODEVERSION=$(sed 's/v//' <<< $(node -v))
NPMVERSION=$(npm -v)
GOVERSION=$(sed -ne 's/[^0-9]*\(\([0-9]\.\)\{0,4\}[0-9][^.]\).*/\1/p' <<< $(go version))
DOCKERVERSION=$(docker version --format '{{.Server.Version}}' | sed 's/[a-z-]//g')
check_prereq 'node' $REQUIREDNODEVERSION $NODEVERSION
check_prereq 'npm' $REQUIREDNPMVERSION $NPMVERSION
check_prereq 'go' $REQUIREDGOVERSION $GOVERSION
check_prereq 'docker' $REQUIREDDOCKERVERSION $DOCKERVERSION