From 18c7486529c68ab12975e9448acd320984fd88a2 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Fri, 29 Mar 2024 05:34:04 +0000 Subject: [PATCH] build: set Finschia/ostracon version (#340) (#342) * Set ostracon version * Update CHANGELOG.md (cherry picked from commit 78f9d87c65cb06494809371b5337106685fce0c1) Co-authored-by: Youngtaek Yoon --- CHANGELOG.md | 1 + Makefile | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0698ee8..9b53f545 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ ### Breaking Changes ### Build, CI +* (build) [\#340](https://github.com/Finschia/finschia/pull/340) Set Finschia/ostracon version ### Docs diff --git a/Makefile b/Makefile index 90cf0278..7401578f 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ endif PACKAGES_SIMTEST=$(shell go list ./... | grep '/simulation') SDK_PACK := $(shell go list -m github.com/Finschia/finschia-sdk | sed 's/ /\@/g') GO_VERSION := $(shell cat go.mod | grep -E 'go [0-9].[0-9]+' | cut -d ' ' -f 2) -OST_VERSION := $(shell go list -m github.com/Finschia/ostracon | sed 's:.* ::') # grab everything after the space in "github.com/Finschia/ostracon v0.34.7" +OCVERSION := $(shell go list -m github.com/Finschia/ostracon | sed 's:.* v::') WASMVM_VERSION=$(shell go list -m github.com/Finschia/wasmvm | awk '{print $$2}') HEIGHLINER_VERSION=v1.5.3 DOCKER := $(shell which docker) @@ -57,7 +57,7 @@ ldflags = -X github.com/Finschia/finschia-sdk/version.Name=finschia \ -X github.com/Finschia/finschia-sdk/version.Commit=$(COMMIT) \ -X github.com/Finschia/finschia-sdk/types.DBBackend=goleveldb \ -X "github.com/Finschia/finschia-sdk/version.BuildTags=$(build_tags_comma_sep)" \ - -X github.com/Finschia/ostracon/version.TMCoreSemVer=$(OST_VERSION) \ + -X github.com/Finschia/ostracon/version.OCCoreSemVer=$(OCVERSION) \ -linkmode=external \ -w -s