Adding support for main branch and also not pushing latest tag if fil…

…e not exist
nxtlytics · Apr 3, 2021 · 276e812 · 276e812
1 parent 377dfb6
commit 276e812
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -44,7 +44,7 @@ This orb provides ready to use workflow jobs in three categories:
     This job should be used for builds on `feature` branches only, as no artifacts are produced.
 
   * `build_npm_and_release` - Build, test, and upload a NPM package to a NPM Registry for use by other packages  
-    Use this job for builds on `master` or `develop` to prepare artifacts (packages) that can be used in other projects
+    Use this job for builds on `main`, `master` or `develop` to prepare artifacts (packages) that can be used in other projects
     or integration tests.
 
 * Pipenv (Python) builds  
@@ -57,7 +57,7 @@ This orb provides ready to use workflow jobs in three categories:
     This job should be used for builds on `feature` branches only, as no artifacts are produced.    
 
   * `build_pipenv_and_release` - Build, test, and upload a PyPi package (via Pipenv) to pypi registry for use by other packages
-    Use this job for builds on `master` or `develop` to prepare artifacts (packages) that can be used in other projects
+    Use this job for builds on `main`, `master` or `develop` to prepare artifacts (packages) that can be used in other projects
 
 ## Example dependent CircleCi task
 
@@ -123,7 +123,7 @@ examples:
                 filters:
                   branches:
                     only:
-                      - master
+                      - main
                       - develop
 ```
 

diff --git a/src/orb.yml b/src/orb.yml
@@ -375,8 +375,8 @@ references:
         docker build -t "${DOCKER_TAG}" .
         echo "${DOCKER_TAG}" > .docker_tag
         if [ ! -z "${CIRCLE_BRANCH}" ]; then
-          if [ $CIRCLE_BRANCH = "master" ]; then
-            ENVIRONMENT="master"
+          if [ $CIRCLE_BRANCH = "master" || $CIRCLE_BRANCH = main ]; then
+            ENVIRONMENT="main"
           elif [ $CIRCLE_BRANCH = "develop" ]; then
             ENVIRONMENT="develop"
           else
@@ -394,7 +394,10 @@ references:
       <<: *common_step_params
       command: |
         docker push "$(cat .docker_tag)"
-        docker push "$(cat .docker_latest_tag)"
+        if [ -e .docker_latest_tag ]; then
+          echo '.docker_latest_tag file exists, I will try to push tag now'
+          docker push "$(cat .docker_latest_tag)"
+        fi
 
 #
 # Commands - CircleCI build steps that can be referenced by name in a job
@@ -664,7 +667,6 @@ executors:
   docker:
     # Build agent for creating Docker images. Slower to start, but infinitely flexible
     machine:
-      docker_layer_caching: true
       resource_class: medium
       image: ubuntu-2004:202101-01
 
@@ -988,5 +990,5 @@ examples:
                 filters:
                   branches:
                     only:
-                      - master
+                      - main
                       - develop