Merge branch 'staging' into test-refactor

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
           commit_sha=${{ github.sha }}
 
           echo "branch name: $branch_name"
-          if [ "$branch_name" != "main" ]; then
+          if [ "$branch_name" != "staging" ]; then # TODO: change back to `main` after deleting staging branch
               echo "Release should build only from main branch"
               exit 1
           fi

.travis.yml

@@ -37,7 +37,7 @@ deploy:
     skip_cleanup: true
     script: bash ./scripts/release.sh
     on:
-      branch: main
+      branch: staging # TODO: change to `main` when replacing default branch to main
       condition: $RELEASE_DATREE_PROD = 'true'
 
 env:

scripts/deploy_release_candidate.sh

@@ -9,7 +9,9 @@ latestRcTag=$(git tag --sort=-version:refname | grep "^${MAJOR_VERSION}.${MINOR_
 if [ "$latestRcTag" == "" ]; then
     nextVersion=$MAJOR_VERSION.$MINOR_VERSION.0
 else
-    nextVersion=$(echo $latestRcTag | awk -F. '{$NF = $NF + 1;} 1' | sed 's/ /./g')
+    # TODO: remove the comment once we are ready to remove the staging deployment
+    # nextVersion=$(echo $latestRcTag | awk -F. '{$NF = $NF + 1;} 1' | sed 's/ /./g')
+    nextVersion=$latestRcTag
 fi
 
 export DATREE_BUILD_VERSION=$nextVersion-rc