diff --git a/.travis.yml b/.travis.yml index 9b48c4ef13e..c4daf83a34e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ before_deploy: deploy: provider: releases api_key: - secure: YOUR_API_KEY_ENCRYPTED + secure: P3+TKR3y4S51jjMp4l9kRm5cjr7Mg2m5rlPcRCjjVp/mVgkkhsMx9K8Rj/Cv/pJe33jbkwRy020gq4lYpa+Yh+Q3A11z3EKXyqizwqsvJtufoIXxXCxt0kLXn8aIh7aLrqVT2wxtkv3RvkRODmLZqvWG4kAfNBuzpcFhstw1RU3WNyahStOgwVJ9tYRdpsJ0ztMmGgQFpT6bppselzEXY7hS7L+l/bLcH9aGON4YECupAE6EilWwGxPs4oLJPmGsWQNogb3SE/oeFDqEJzciWcObk264fwIBf28HtmszQSmVbOuOfg/OhcVg13OvPXmRGk9hvU2kyzehMLZ0zeEE1mKsGmoObziNVuYPPY3KbRlsYARX41M1QKAI1YFe9NIXC5yhemOy4Xv0g82jyZmYWrf6QydLBZWkztUL7mJ6DkrG+5EohVVC2oprBS32/w736f8AWwHJSfL/JrFMTDctdYzUaf0yZMdfKdLdRyP/Q5KTfhUJl8zHAOih8f23WJVCSlwyJBYDzkq5OmNGf7BxJYkJExUOUwXcJE9jYgXq0y291N9BtG2cUVKhZZsSSrvR32bMtYtTT2a3ZlTHJpzVI+lZStYDpE/wyJRqnjqf9p8bDxc1l2mQGSxgyY8Yv8u9c+RCCj4tRwZTrJ4LIBWecDPS5hobV3Q1Dg3sW2UGRXA= file_glob: true file: - deploy/*.tar.gz diff --git a/CHANGELOG.md b/CHANGELOG.md index d8c724db589..98762e3f6a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,13 @@ Changes by Version ================== -Next (unreleased) +1.4.1 (2018-04-21) ------------------ +#### Backend Changes + +- Publish binaries for Linux, Darwin, and Windows (#765) - thanks to @grounded042 + #### UI Changes ##### New Features diff --git a/scripts/travis/package-deploy.sh b/scripts/travis/package-deploy.sh index 69d21997450..09abab850da 100755 --- a/scripts/travis/package-deploy.sh +++ b/scripts/travis/package-deploy.sh @@ -7,7 +7,8 @@ function stage-file { echo "Copying $1 to $2" cp $1 $2 else - echo "$1 does not exist. Continuing on." + echo "$1 does not exist. Aborting." + exit 1 fi } @@ -23,6 +24,8 @@ function stage-platform-files { stage-file ./cmd/agent/agent-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-agent$FILE_EXTENSION stage-file ./cmd/query/query-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-query$FILE_EXTENSION stage-file ./cmd/collector/collector-$PLATFORM $PACKAGE_STAGING_DIR/jaeger-collector$FILE_EXTENSION + echo "Copying jaeger-ui-build to $PACKAGE_STAGING_DIR" + cp -r jaeger-ui-build $PACKAGE_STAGING_DIR } # package pulls built files for the platform ($1). If you pass in a file @@ -31,37 +34,39 @@ function package { local PLATFORM=$1 local FILE_EXTENSION=$2 - local PACKAGE_STAGING_DIR=$DEPLOY_STAGING_DIR/$PLATFORM + local PACKAGE_STAGING_DIR=jaeger-$VERSION-$PLATFORM-amd64 mkdir $PACKAGE_STAGING_DIR stage-platform-files $PLATFORM $PACKAGE_STAGING_DIR $FILE_EXTENSION - local PACKAGE_FILES=$(ls -A $PACKAGE_STAGING_DIR/*) 2>/dev/null - - if [ "$PACKAGE_FILES" ]; then - local ARCHIVE_NAME="jaeger-$VERSION-$PLATFORM-amd64.tar.gz" - echo "Packaging the following files into $ARCHIVE_NAME:" - echo $PACKAGE_FILES - tar -czvf ./deploy/$ARCHIVE_NAME $PACKAGE_FILES - else - echo "Will not package or deploy $PLATFORM files as there are no files to package!" - fi + local ARCHIVE_NAME="$PACKAGE_STAGING_DIR.tar.gz" + echo "Packaging into $ARCHIVE_NAME:" + tar -czvf ./deploy/$ARCHIVE_NAME $PACKAGE_STAGING_DIR } # script start +if [ "$DEPLOY" != true ]; then + echo "Skipping the packaging of binaries as \$DEPLOY was not true." + exit 0 +fi + +set -e DEPLOY_STAGING_DIR=./deploy-staging VERSION="$(make echo-version | awk 'match($0, /([0-9]*\.[0-9]*\.[0-9]*)$/) { print substr($0, RSTART, RLENGTH) }')" echo "Working on version: $VERSION" # make needed directories +rm -rf deploy $DEPLOY_STAGING_DIR mkdir deploy mkdir $DEPLOY_STAGING_DIR -if [ "$DEPLOY" = true ]; then - package linux - package darwin - package windows .exe -else - echo "Skipping the packaging of binaries as \$DEPLOY was not true." +INDEX_HTML=jaeger-ui-build/build/index.html +if [ ! -f $INDEX_HTML ]; then + echo "Cannot find UI assets, e.g. $INDEX_HTML. Aborting." + exit 1 fi + +package linux +package darwin +package windows .exe