From 5c3a16ef3a4de7c82a829475182b849ed6c2f179 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Thu, 11 Jun 2020 11:06:47 -0400 Subject: [PATCH] Fix buildinfo updates on non-linux-amd64 builds --- .travis.yml | 5 ++++- doc/release-notes.md | 10 ++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 397cdf006..444febaed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ jobs: script: - set -e - sudo dpkg --add-architecture armhf - - sudo apt-get update -yq + - sudo apt-get update -yq - |- sudo apt-get -yq install \ crossbuild-essential-armhf \ @@ -30,6 +30,7 @@ jobs: - pip install --upgrade --user pip - pip install --user awscli - go get github.com/mitchellh/gox + - ziti-ci generate-build-info common/version/info_generated.go version - CC=arm-linux-gnueabihf-gcc CGO_ENABLED=true gox -cgo -os="$GOX_OS" -arch=arm -output=$GOX_OUTPUT ./... - aws s3 sync release/ s3://ziti-cmd-build-tmp/$TRAVIS_BUILD_ID @@ -41,6 +42,7 @@ jobs: - pip install --upgrade pip - pip install awscli - go get github.com/mitchellh/gox + - ziti-ci generate-build-info common/version/info_generated.go version - CGO_ENABLED=true gox -os="$GOX_OS" -arch=$TRAVIS_CPU_ARCH -output=$GOX_OUTPUT ./... - aws s3 sync release/ s3://ziti-cmd-build-tmp/$TRAVIS_BUILD_ID @@ -53,6 +55,7 @@ jobs: - python -m pip install --upgrade pip - pip install awscli - go get github.com/mitchellh/gox + - ziti-ci generate-build-info common/version/info_generated.go version - CGO_ENABLED=true gox -os="$GOX_OS" -arch=$TRAVIS_CPU_ARCH -output=$GOX_OUTPUT ./... - aws s3 sync release/ s3://ziti-cmd-build-tmp/$TRAVIS_BUILD_ID diff --git a/doc/release-notes.md b/doc/release-notes.md index 50258e18f..6aa561c12 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -1,3 +1,13 @@ +# Release 0.14.13 +Ziti 0.14.13 includes the following: + +* Ensure version information gets updated on non linux-amd64 builds + +# Release 0.14.12 +Ziti 0.14.12 includes the following: + +* Fix the logging prefix to be github.com/openziti + # Release 0.14.11 Ziti 0.14.11 includes the following: