From 9ed1d5b96d805718aafa28c92eccbd20f109c8af Mon Sep 17 00:00:00 2001 From: zemyblue Date: Tue, 11 Jun 2024 22:16:52 +0900 Subject: [PATCH 1/2] chore: modify how binary version is defined Signed-off-by: zemyblue --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 7401578f..96d51eb6 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,12 @@ COMMIT ?= $(shell git log -1 --format='%H') -# ascribe tag only if on a release/ branch, otherwise pick branch name and concatenate commit hash +# Specify a tag only if it has a specific tag, otherwise choose a branch name and concatenate the commit hash. ifeq (,$(VERSION)) BRANCH := $(shell git rev-parse --abbrev-ref HEAD) VERSION := $(shell echo $(shell git describe --tags) | sed 's/^v//') - ifeq (, $(findstring release/,$(BRANCH))) + SHORT_COMMIT := $(shell git log -1 --format='%h') + ifneq (, $(findstring $(SHORT_COMMIT),$(VERSION))) VERSION = $(subst /,_,$(BRANCH))-$(COMMIT) endif endif From 726c33ee7d7aad03cc4c705c97acbffc67b39bd4 Mon Sep 17 00:00:00 2001 From: zemyblue Date: Wed, 12 Jun 2024 15:27:07 +0900 Subject: [PATCH 2/2] chore: update changelog Signed-off-by: zemyblue --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e5d54ee..5c004783 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -58,7 +58,8 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (build) [\#340](https://github.com/Finschia/finschia/pull/340) Set Finschia/ostracon version * (ci) [\#361](https://github.com/Finschia/finschia/pull/361) Replace deprecated linters with new ones * (ci) [\#362](https://github.com/Finschia/finschia/pull/362) Add RELEASE_NOTE.md to .gitignore -* (swagger) [\#371](https://github.com/Finschia/finschia/pull/371) Add fswap and fbridge swagger settings in swagger config +* (swagger) [\#371](https://github.com/Finschia/finschia/pull/371) Add fswap and fbridge swagger settings in swagger config +* (build) [\#388](https://github.com/Finschia/finschia/pull/388) Modify the way the binary version is set when compiling ### Docs