From 69a006fd88904a755808798cd37852316c63b59b Mon Sep 17 00:00:00 2001 From: Dustin Willis Webber Date: Sun, 12 Apr 2015 16:36:29 -0400 Subject: [PATCH] ci script fix --- .ci/deploy.sh | 14 +++++++------- Makefile | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci/deploy.sh b/.ci/deploy.sh index 0d9c9df..bf13805 100755 --- a/.ci/deploy.sh +++ b/.ci/deploy.sh @@ -4,7 +4,7 @@ set -e NAME="envdb" BRANCH="master" -VERSION=$(cat ${NAME}.go | grep -oP "Version\s+?\=\s?\"\K.*?(?=\"$|$)") +VERSION=$(cat .Version) OLD_VERSION="0.2.0" YANK_OLD_VERSIONS=true @@ -12,18 +12,18 @@ PREFIX="mephux/$NAME" RELEASE_PATH="release" DEB="${NAME}_${OLD_VERSION}_amd64.deb" -DEB386="${NAME}-${OLD_VERSION}_386.deb" +DEB386="${NAME}_${OLD_VERSION}_386.deb" if [ "$DRONE_BRANCH" = "$BRANCH" ] && [ "$DRONE_PR" != "true" ]; then echo "MASTER BRANCH: Deploying..." if [ "$YANK_OLD_VERSIONS" = true ]; then - package_cloud yank $PREFIX/ubuntu/lucid $DEB - package_cloud yank $PREFIX/ubuntu/hardy $DEB - package_cloud yank $PREFIX/ubuntu/utopic $DEB - package_cloud yank $PREFIX/ubuntu/precise $DEB - package_cloud yank $PREFIX/ubuntu/trusty $DEB + # package_cloud yank $PREFIX/ubuntu/lucid $DEB + # package_cloud yank $PREFIX/ubuntu/hardy $DEB + # package_cloud yank $PREFIX/ubuntu/utopic $DEB + # package_cloud yank $PREFIX/ubuntu/precise $DEB + # package_cloud yank $PREFIX/ubuntu/trusty $DEB package_cloud yank $PREFIX/ubuntu/lucid $DEB386 package_cloud yank $PREFIX/ubuntu/hardy $DEB386 diff --git a/Makefile b/Makefile index bd4f92b..fddafc2 100755 --- a/Makefile +++ b/Makefile @@ -60,7 +60,6 @@ gox: @rm -rf Godeps/_workspace/src/github.com/$(GITHUB_USER)/$(NAME) release: clean all test gox setup package - @echo $(VERSION) > .Version @for os in $(CCOS); do \ for arch in $(CCARCH); do \ cd pkg/$$os-$$arch/; \ @@ -82,6 +81,7 @@ clean: setup: @$(ECHO) "$(OK_COLOR)==> Building Packages $(NAME)$(NO_COLOR)" + @echo $(VERSION) > .Version @mkdir -p package/root/usr/bin @cp -R bin/$(NAME) package/root/usr/bin @mkdir -p release/