[incubator-pinot] branch txt-hotfix updated (184655b -> 9c86da4)

[jl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jlli pushed a change to branch txt-hotfix
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git.


 discard 184655b  Modify .travis_install.sh
     new 9c86da4  Modify .travis_install.sh

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (184655b)
            \
             N -- N -- N   refs/heads/txt-hotfix (9c86da4)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .travis/.travis_install.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org

[incubator-pinot] 01/01: Modify .travis_install.sh

[jl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jlli pushed a commit to branch txt-hotfix
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git

commit 9c86da467d607f8f05e5e27889bdda3c635bc51d
Author: Jack Li(Analytics Engineering) <jl...@jlli-mn1.linkedin.biz>
AuthorDate: Mon Oct 26 22:34:33 2020 -0700

    Modify .travis_install.sh
---
 .travis/.travis_install.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.travis/.travis_install.sh b/.travis/.travis_install.sh
index 5b676cc..e3b8061 100755
--- a/.travis/.travis_install.sh
+++ b/.travis/.travis_install.sh
@@ -49,6 +49,12 @@ java -version
 if [ $noThirdEyeChange -ne 0 ]; then
   echo "Full Pinot build"
   echo "No ThirdEye changes"
+
+  echo "Fixing git setup for $TRAVIS_BRANCH"
+  git checkout -b ${TRAVIS_BRANCH} origin/${TRAVIS_BRANCH}
+  git config branch.${TRAVIS_BRANCH}.remote origin
+  git config branch.${TRAVIS_BRANCH}.merge refs/heads/${TRAVIS_BRANCH}
+
   if [ "$TRAVIS_JDK_VERSION" != 'oraclejdk8' ]; then
     # JDK 11 prints more logs exceeding Travis limits.
     mvn clean install -B -DskipTests=true -Pbin-dist -Dmaven.javadoc.skip=true ${DEPLOY_BUILD_OPTS} ${KAFKA_BUILD_OPTS} > /tmp/mvn_build_log


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org