[DEV] Updated & simplified script

Author: CircleCI Bumpversion

.circleci/config.yml

@@ -97,7 +97,6 @@ jobs:
       - run:
           name: Define run environment variables
           command: |
-            if [[ $(git branch --show-current) == "dev" ]]; then SUFFIX="-dev"; else SUFFIX=""; fi
             echo 'export COMMIT_MESSAGE="$(git log  --format=%B -n 1)"' >> $BASH_ENV
             echo 'export SUFFIX=$SUFFIX' >> $BASH_ENV
             echo 'Defined VARS: SUFFIX:$SUFFIX  COMMIT_MESSAGE:$COMMIT_MESSAGE'
@@ -110,16 +109,14 @@ jobs:
                 name: Push Docker image
                 command: |
                   source $BASH_ENV
-                  if [[ ! $COMMIT_MESSAGE == *"[NV]"* ]] && [[ ! $COMMIT_MESSAGE == *"[DOC]"* ]];
-                  then
-                    git pull
-                    VERSION_NEW=$(cat setup.py| grep version | cut -c 20- | rev | cut -c 3- | rev)
-                    docker login -u $DOCKER_USER  -p $DOCKER_PASS
-                    docker pull << parameters.base-image>>:latest
-                    docker build -f << parameters.dockerfile >>  -t << parameters.target-image >>$SUFFIX:$VERSION_NEW .
-                    docker push << parameters.target-image >>$SUFFIX:$VERSION_NEW
-                    docker tag << parameters.target-image >>$SUFFIX:$VERSION_NEW  << parameters.target-image >>$SUFFIX:latest
-                    docker push << parameters.target-image >>$SUFFIX:latest
+                  git pull
+                  VERSION_NEW=$(cat setup.py| grep version | cut -c 20- | rev | cut -c 3- | rev)
+                  docker login -u $DOCKER_USER  -p $DOCKER_PASS
+                  docker pull << parameters.base-image>>:latest
+                  docker build -f << parameters.dockerfile >>  -t << parameters.target-image >>$SUFFIX:$VERSION_NEW .
+                  docker push << parameters.target-image >>$SUFFIX:$VERSION_NEW
+                  docker tag << parameters.target-image >>$SUFFIX:$VERSION_NEW  << parameters.target-image >>$SUFFIX:latest
+                  docker push << parameters.target-image >>$SUFFIX:latest
 
   deploy-pypi:
     docker:
@@ -138,13 +135,11 @@ jobs:
                 name: Push to PyPi
                 command: |
                   source $BASH_ENV
-                  if [[ ! $COMMIT_MESSAGE == *"[NV]"* ]] && [[ ! $COMMIT_MESSAGE == *"[DOC]"* ]];
-                  then
-                    git pull
-                    VERSION_NEW=$(cat setup.py| grep version | cut -c 20- | rev | cut -c 3- | rev)
-                    docker pull fentechai/cdt:$VERSION_NEW
-                    docker run -e PYPI_PASSWORD --rm fentechai/cdt:$VERSION_NEW /bin/sh -c 'cd /CDT && pip3 install --upgrade keyrings.alt && pip3 install twine wheel && python3 setup.py sdist bdist_wheel && twine upload -u divkal -p "$PYPI_PASSWORD" dist/*'
-                  fi
+                  git pull
+                  VERSION_NEW=$(cat setup.py| grep version | cut -c 20- | rev | cut -c 3- | rev)
+                  docker pull fentechai/cdt:$VERSION_NEW
+                  docker run -e PYPI_PASSWORD --rm fentechai/cdt:$VERSION_NEW /bin/sh -c 'cd /CDT && pip3 install --upgrade keyrings.alt && pip3 install twine wheel && python3 setup.py sdist bdist_wheel && twine upload -u divkal -p "$PYPI_PASSWORD" dist/*'
+
   build-docs:
     docker:
       - image: docker:17.05.0-ce-git