Fix environment variable loading [deploy]

Author: jamesmortensen

.circleci/config.yml

@@ -164,6 +164,11 @@ jobs:
       - run: |
           echo "CIRCLE_WORKFLOW_ID = " $CIRCLE_WORKFLOW_ID
           echo $PWD
+          echo 'export BUILD_DATE=$(date '+%Y%m%d')' >> $BASH_ENV
+          echo 'export BRANCH=4.1.3' >> $BASH_ENV     # find a better place to control this.
+          source $BASH_ENV
+          echo BRANCH="$BRANCH"
+          
       - run: |
           echo "Check if branch is deployable (contains [deploy] in commit msg on $DEPLOY_BRANCH"
           echo "Job name = " $CIRCLE_JOB
@@ -185,8 +190,8 @@ jobs:
           echo "Build and Push Docker images"
           echo "Login to Docker, and setup to use a buildx builder and push built multi-arch images"
           docker buildx use `docker buildx create`
-          echo 'export BUILD_DATE=$(date '+%Y%m%d')' >> $BASH_ENV
-          echo 'export BRANCH=4.1.3' >> $BASH_ENV     # find a better place to control this.
+          #echo 'export BUILD_DATE=$(date '+%Y%m%d')' >> $BASH_ENV
+          #echo 'export BRANCH=4.1.3' >> $BASH_ENV     # find a better place to control this.
           echo BRANCH="$BRANCH"
           docker buildx ls
           docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"