From c6e68456540cc15aaaa682ea4c544ee5cbbf70a5 Mon Sep 17 00:00:00 2001
From: Riko Eksteen <reksteen@gmail.com>
Date: Wed, 25 Dec 2019 22:19:10 +0000
Subject: [PATCH] build: extra environment from circle tag

- there could be multiple env-* tags on a commit, so look at the requested CIRCLE_TAG environment variable
---
 .circleci/config.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7c072a5d1d..07364bc782 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -363,8 +363,10 @@ jobs:
             echo "Parsing current commit tags. Looking for version and requested environment."
 
             echo "Environment is found via env-* tags"
-            ENVIRONMENT_TAG=$(git tag -l --points-at HEAD env-*)
-            DEPLOY_TARGET=${ENVIRONMENT_TAG/env-/}
+            ENVIRONMENT_TAGS=$(git tag -l --points-at HEAD env-*)
+            echo "Current env-* tags: $ENVIRONMENT_TAGS"
+            echo "Requested tag via CircleCI: $CIRCLE_TAG"
+            DEPLOY_TARGET=${CIRCLE_TAG/env-/}
             echo "DEPLOY_TARGET: $DEPLOY_TARGET"
 
             echo "Build version is found via git describe"