From 9cfafa741a058e255f201d433e78e51514693de2 Mon Sep 17 00:00:00 2001 From: Yuri Shkuro Date: Thu, 12 Nov 2020 11:25:41 -0500 Subject: [PATCH] Bump to latest UI for snapshot builds (#2626) Signed-off-by: Yuri Shkuro --- jaeger-ui | 2 +- scripts/travis/build-all-in-one-image.sh | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/jaeger-ui b/jaeger-ui index fd216065375..df17e8d80e6 160000 --- a/jaeger-ui +++ b/jaeger-ui @@ -1 +1 @@ -Subproject commit fd2160653755f2d2ffa3466df53b080eda22badf +Subproject commit df17e8d80e6f630ed3ed744a80dbf27c0418718c diff --git a/scripts/travis/build-all-in-one-image.sh b/scripts/travis/build-all-in-one-image.sh index 8b390da13e7..46492a387d8 100755 --- a/scripts/travis/build-all-in-one-image.sh +++ b/scripts/travis/build-all-in-one-image.sh @@ -29,13 +29,12 @@ run_integration_test() { upload_to_docker() { # Only push the docker container to Docker Hub for master branch if [[ ("$BRANCH" == "master" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+$) && "$TRAVIS_SECURE_ENV_VARS" == "true" ]]; then - echo 'upload to Docker Hub' + echo "upload $1 to Docker Hub" + export REPO=$1 + bash ./scripts/travis/upload-to-docker.sh else echo 'skip docker upload for PR' - exit 0 fi - export REPO=$1 - bash ./scripts/travis/upload-to-docker.sh } make build-all-in-one GOOS=linux GOARCH=$GOARCH