From 078268a164d0fd36cc1817b1e815c56ee51f4ea2 Mon Sep 17 00:00:00 2001
From: Franck Cuny <franck@fcuny.net>
Date: Thu, 9 Sep 2021 18:03:00 -0700
Subject: build: get the proper version for tagging

We were evaluating the version of the app when the rule was evaluated,
while we need to get the version after we run `flyctl deploy`.

Since we're tagging a release, let's also annotate the tag.

Remove the `--build-arg` argument to `flyct deploy` since it's being
ignored (same with `docker build`).

Closes #1.
---
 Makefile | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index d602b52..b117922 100644
--- a/Makefile
+++ b/Makefile
@@ -17,16 +17,13 @@ worktree-clean:
 
 deploy: worktree-clean docker-build
 	@echo "Deploying to fly ..."
-	flyctl deploy \
-		--build-arg IMAGE_REF=$(DOCKER_IMAGE_REF)
-	@sleep 5
-	git tag --message $(shell flyctl info -j |jq '.App | "\(.Name)/v\(.Version)"') $(shell flyctl info -j |jq '.App | "\(.Name)/v\(.Version)"')
+	flyctl deploy
+	@git tag -a --message $$(flyctl info -j |jq -r '.App | "fcuny.net/v\(.Version)"') $$(flyctl info -j |jq -r '.App | "fcuny.net/v\(.Version)"')
 
 docker-build:
 	@echo "Building Docker image ..."
 	$(DOCKER) build $(DOCKER_BUILD_ARGS) \
 		--tag "${DOCKER_IMAGE}:${DOCKER_IMAGE_REF}" \
-	  --build-arg IMAGE_REF=$(DOCKER_IMAGE_REF) \
 		--file "$(DOCKERFILE)" \
 		"$(PROJECT_DIR)"
 
-- 
cgit 1.4.1