Skip to content

Commit

Permalink
chore: improve fxcored version cmd
Browse files Browse the repository at this point in the history
(cherry picked from commit 0a03d2f)

chore: fix tendermint version

(cherry picked from commit b7684ea)
(cherry picked from commit 2428262)
  • Loading branch information
zakir-code committed May 27, 2024
1 parent 8c9b7b7 commit f44208f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 17 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/docker-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ jobs:
${{ secrets.DOCKER_HUB_USERNAME }}/${{ github.event.repository.name }}
tags: |
type=semver,pattern={{version}}
flavor: |
latest: false
- name: Login to Docker Hub
uses: docker/login-action@v2
Expand Down
5 changes: 4 additions & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,7 @@ changelog:
- '^docs:'
- '^test:'
snapshot:
name_template: "{{ .Tag }}-next"
name_template: "{{ .Tag }}-next"

release:
draft: true
18 changes: 2 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
#!/usr/bin/make -f

BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
COMMIT := $(shell git log -1 --format='%H')

# don't override user values
ifeq (,$(VERSION))
ifeq ($(OS),Windows_NT)
VERSION := $(shell git describe --exact-match 2>$null)
else
VERSION := $(shell git describe --exact-match 2>/dev/null)
endif
# if VERSION is empty, then populate it with branch's name and raw commit hash
ifeq (,$(VERSION))
VERSION := $(BRANCH)-$(COMMIT)
endif
endif
VERSION := $(shell git describe --tags --always 2>/dev/null || echo 'unknown')
COMMIT := $(shell git log -1 --format='%H' 2>/dev/null || echo 'unknown')

LEDGER_ENABLED ?= true
BUILDDIR ?= $(CURDIR)/build
Expand Down Expand Up @@ -71,7 +58,6 @@ BUILD_TAGS_COMMA_SEP := $(subst $(whitespace),$(comma),$(build_tags))
ldflags = -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
-X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-X "github.com/cosmos/cosmos-sdk/version.BuildTags=$(BUILD_TAGS_COMMA_SEP)" \
-X github.com/tendermint/tendermint/version.TMCoreSemVer=$(VERSION) \
-X github.com/cosmos/cosmos-sdk/version.Name=fxcore \
-X github.com/cosmos/cosmos-sdk/version.AppName=fxcored \

Expand Down

0 comments on commit f44208f

Please sign in to comment.