Merge pull request #32 from kakkoyun/fix_circleci_trigger

Only trigger release job for SemVer tags

.circleci/config.yml

@@ -63,15 +63,6 @@ workflows:
       - lint
       - test
       - generate
-  tagged-master:
-    jobs:
-      - container-release:
-          filters:
-            tags:
-              only: /^v.*/
-            branches:
-              only:
-                - master
   commit-master:
     jobs:
       - build
@@ -85,3 +76,17 @@ workflows:
             branches:
               only:
                 - master
+  tagged-master:
+    jobs:
+      - container-release:
+          filters:
+            tags:
+              # Suggested SemVer regex:
+              # https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
+              # https://regex101.com/r/vkijKf/1/
+              # NOTICE: with an additional "v" as prefix.
+              only: /v^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/
+            branches:
+              only:
+                - master
+                - /release-.*/

Makefile

@@ -126,9 +126,11 @@ container-push: container
 	docker push $(DOCKER_REPO):latest
 
 .PHONY: container-release
+container-release: VERSION_TAG = $(strip $(shell [ -d .git ] && git tag --points-at HEAD))
 container-release: container
-	@docker tag $(DOCKER_REPO):$(VCS_BRANCH)-$(BUILD_DATE)-$(VERSION) $(DOCKER_REPO):$(VERSION)
-	docker push $(DOCKER_REPO):$(VERSION)
+	# https://git-scm.com/docs/git-tag#Documentation/git-tag.txt---points-atltobjectgt
+	@docker tag $(DOCKER_REPO):$(VCS_BRANCH)-$(BUILD_DATE)-$(VERSION) $(DOCKER_REPO):$(VERSION_TAG)
+	docker push $(DOCKER_REPO):$(VERSION_TAG)
 	docker push $(DOCKER_REPO):latest
 
 .PHONY: integration-test-dependencies