Merge branch 'master' into feature/iss-304-other-names

WormBase · Oct 2, 2020 · 2f3a61d · 2f3a61d
2 parents eda2c93 + 5bfe849
commit 2f3a61d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -13,9 +13,12 @@ VERSION ?= $(shell clj -A:spit-version -v | jq .version)
 ARTIFACT_NAME ?= $(shell git describe --tags --abbrev=0)
 FQ_TAG := ${WB_ACC_NUM}.dkr.ecr.us-east-1.amazonaws.com/${ECR_REPO_NAME}:${VERSION}
 # Set AWS (EB) profile env vars if undefined
-AWS_EB_PROFILE ?= ${AWS_PROFILE}
-AWS_PROFILE ?= ${AWS_EB_PROFILE}
+ifneq (${AWS_PROFILE},)
+	AWS_EB_PROFILE ?= ${AWS_PROFILE}
+endif
 ifneq (${AWS_EB_PROFILE},)
+	AWS_PROFILE ?= ${AWS_EB_PROFILE}
+
 	export AWS_EB_PROFILE
 endif