From 926c7631aeb06bc2fdfe4a11380f3f8fe07b6ec6 Mon Sep 17 00:00:00 2001 From: David Dworken Date: Fri, 8 Apr 2022 23:07:44 -0700 Subject: [PATCH] Fix makefile to run in correct order for deploys to work --- Makefile | 6 ++++-- VERSION | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0a4aa87..c979beb 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,10 @@ test: HISHTORY_TEST=1 go test -p 1 ./... release: - git tag v0.`cat VERSION` expr `cat VERSION` + 1 > VERSION + git tag v0.`cat VERSION` + git add VERSION + git commit -m "Bump hishtory version" git push --tags build-static: @@ -20,5 +22,5 @@ deploy-api: build-api docker push gcr.io/dworken-k8s/hishtory-api kubectl patch deployment hishtory-api -p "{\"spec\":{\"template\":{\"metadata\":{\"labels\":{\"ts\":\"`date|sed -e 's/ /_/g'|sed -e 's/:/-/g'`\"}}}}}}" -deploy: deploy-static deploy-api release +deploy: release deploy-static deploy-api diff --git a/VERSION b/VERSION index 7f8f011..45a4fb7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7 +8