From 109a39eacfe70c6e67b5aea47ceb988ce97969eb Mon Sep 17 00:00:00 2001 From: Josh Soref <2119212+jsoref@users.noreply.github.com> Date: Thu, 12 May 2022 03:48:48 -0400 Subject: [PATCH] spelling: build (#19649) Signed-off-by: Josh Soref Co-authored-by: Josh Soref Co-authored-by: Mattermod --- .circleci/config.yml | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 56f2535291..e6f76d9d8c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -78,7 +78,7 @@ jobs: steps: # Taken from https://github.com/entur/owasp-orb/blob/master/src/%40orb.yml#L349-L361 - owasp/generate_cache_keys: - cache_key: commmandline-default-cache-key-v7 + cache_key: commandline-default-cache-key-v7 - owasp/restore_owasp_cache - run: name: Update OWASP Dependency-Check Database diff --git a/Makefile b/Makefile index 9373712d51..a60048129a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: build package run stop run-client run-server run-haserver stop-haserver stop-client stop-server restart restart-server restart-client restart-haserver start-docker clean-dist clean nuke check-style check-client-style check-server-style check-unit-tests test dist prepare-enteprise run-client-tests setup-run-client-tests cleanup-run-client-tests test-client build-linux build-osx build-windows package-prep package-linux package-osx package-windows internal-test-web-client vet run-server-for-web-client-tests diff-config prepackaged-plugins prepackaged-binaries test-server test-server-ee test-server-quick test-server-race start-docker-check migrations-bindata new-migration +.PHONY: build package run stop run-client run-server run-haserver stop-haserver stop-client stop-server restart restart-server restart-client restart-haserver start-docker clean-dist clean nuke check-style check-client-style check-server-style check-unit-tests test dist run-client-tests setup-run-client-tests cleanup-run-client-tests test-client build-linux build-osx build-windows package-prep package-linux package-osx package-windows internal-test-web-client vet run-server-for-web-client-tests diff-config prepackaged-plugins prepackaged-binaries test-server test-server-ee test-server-quick test-server-race start-docker-check migrations-bindata new-migration ROOT := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) @@ -53,7 +53,7 @@ else endif BUILD_WEBAPP_DIR ?= ../mattermost-webapp BUILD_CLIENT = false -BUILD_HASH_CLIENT = independant +BUILD_HASH_CLIENT = independent ifneq ($(wildcard $(BUILD_WEBAPP_DIR)/.),) ifeq ($(BUILD_CLIENT),true) BUILD_CLIENT = true