diff --git a/Makefile b/Makefile index 41b8f6b6f..9c9a7c575 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ build: @ go build -i github.com/tendermint/abci/cmd/... dist: - @ sudo bash scripts/dist.sh + @ bash scripts/dist.sh @ bash scripts/publish.sh # test.sh requires that we run the installed cmds, must not be out of date diff --git a/scripts/dist.sh b/scripts/dist.sh index 86884c252..d94ce20f7 100755 --- a/scripts/dist.sh +++ b/scripts/dist.sh @@ -21,12 +21,11 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )" # Change into that dir because we expect that. cd "$DIR" -## Generate the tag. -#if [ -z "$NOTAG" ]; then -# echo "==> Tagging..." -# git commit --allow-empty -a -m "Release v$VERSION" -# git tag -a -m "Version $VERSION" "v${VERSION}" master -#fi +# Delete the old dir +echo "==> Removing old directory..." +rm -rf build/pkg +mkdir -p build/pkg + # Do a hermetic build inside a Docker container. docker build -t tendermint/${REPO_NAME}-builder scripts/${REPO_NAME}-builder/ diff --git a/scripts/dist_build.sh b/scripts/dist_build.sh index 94fabe1b5..0f5e3e3b0 100755 --- a/scripts/dist_build.sh +++ b/scripts/dist_build.sh @@ -18,11 +18,6 @@ GIT_IMPORT="github.com/tendermint/abci/version" XC_ARCH=${XC_ARCH:-"386 amd64 arm"} XC_OS=${XC_OS:-"solaris darwin freebsd linux windows"} -# Delete the old dir -echo "==> Removing old directory..." -rm -rf build/pkg -mkdir -p build/pkg - # Make sure build tools are available. make tools