chore: Modify the way the binary version is set when compiling (backp…

…ort #388) (#390) * chore: Modify the way the binary version is set when compiling (#388) * chore: modify how binary version is defined Signed-off-by: zemyblue <[email protected]> * chore: update changelog Signed-off-by: zemyblue <[email protected]> --------- Signed-off-by: zemyblue <[email protected]> (cherry picked from commit 7d99e17) # Conflicts: # CHANGELOG.md * chore: modify subnet of localnet for docker-compose.yml Signed-off-by: zemyblue <[email protected]> * fix: conflict Signed-off-by: zemyblue <[email protected]> --------- Signed-off-by: zemyblue <[email protected]> Co-authored-by: zemyblue <[email protected]>
Finschia · Jun 24, 2024 · 6047f74 · 6047f74
1 parent 0d1b050
commit 6047f74
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,6 +45,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ### Breaking Changes
 
 ### Build, CI
+* (build) [\#390](https://github.com/Finschia/finschia/pull/390) Modify the way the binary version is set when compiling (backport #388)
 
 ### Docs
 

diff --git 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

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -64,5 +64,5 @@ networks:
       driver: default
       config:
       -
-        subnet: 192.168.10.0/16
+        subnet: 192.168.10.0/24