Merge pull request #2740 from algorand/relstable-2.9.1-remerge

Author: algojohnlee

.travis.yml

@@ -7,11 +7,11 @@ if: tag IS blank
 
 stages:
   - name: build_commit
-    if: NOT (branch =~ /^rel\//) AND type != pull_request
+    if: NOT (branch =~ /^hotfix\//) AND NOT (branch =~ /^rel\//) AND type != pull_request
   - name: build_pr
     if: type = pull_request
   - name: build_release
-    if: branch =~ /^rel\// AND type != pull_request
+    if: (branch =~ /^hotfix\// OR branch =~ /^rel\//) AND type != pull_request
   - name: deploy
     if: branch =~ /^rel\// AND type != pull_request
   - name: post_deploy

config/version.go

@@ -33,7 +33,7 @@ const VersionMajor = 2
 
 // VersionMinor is the Minor semantic version number (x.#.z) - changed when backwards-compatible features are introduced.
 // Not enforced until after initial public release (x > 0).
-const VersionMinor = 9
+const VersionMinor = 10
 
 // Version is the type holding our full version information.
 type Version struct {

scripts/travis/run_tests.sh

@@ -4,14 +4,14 @@ set -e
 
 if [ "${BUILD_TYPE}" = "integration" ]; then
     # Run short tests when doing pull requests; leave the long testing for nightly runs.
-    if [[ "${TRAVIS_BRANCH}" =~ ^rel/nightly ]]; then
+    if [[ "${TRAVIS_BRANCH}" =~ ^rel/nightly ]] || [[ "${TRAVIS_BRANCH}" =~ ^hotfix/ ]]; then
         SHORTTEST=
     else
         SHORTTEST=-short
     fi
     export SHORTTEST 
     make integration
-elif [ "${TRAVIS_EVENT_TYPE}" = "cron" ] || [[ "${TRAVIS_BRANCH}" =~ ^rel/ ]]; then
+elif [ "${TRAVIS_EVENT_TYPE}" = "cron" ] || [[ "${TRAVIS_BRANCH}" =~ ^rel/ ]]  || [[ "${TRAVIS_BRANCH}" =~ ^hotfix/ ]]; then
     make fulltest -j2
 else
     make shorttest -j2