e2e: fix Makefile to produce commit_hash for builtin (celestiaorg#432)

* e2e: fix Makefile to produce commit_hash for builtin

* Added changelog

* Revert "Added changelog"

This reverts commit 6c9a6835c43118f03bbfb032f3482884c354c2c7.

Author: sergio-mena

Makefile

@@ -1,52 +1,12 @@
+include common.mk
+
 PACKAGES=$(shell go list ./...)
 BUILDDIR?=$(CURDIR)/build
 OUTPUT?=$(BUILDDIR)/cometbft
 
-BUILD_TAGS?=cometbft
-
-COMMIT_HASH := $(shell git rev-parse --short HEAD)
-LD_FLAGS = -X github.com/cometbft/cometbft/version.TMGitCommitHash=$(COMMIT_HASH)
-BUILD_FLAGS = -mod=readonly -ldflags "$(LD_FLAGS)"
 HTTPS_GIT := https://github.com/cometbft/cometbft.git
 CGO_ENABLED ?= 0
 
-# handle nostrip
-ifeq (,$(findstring nostrip,$(COMETBFT_BUILD_OPTIONS)))
-  BUILD_FLAGS += -trimpath
-  LD_FLAGS += -s -w
-endif
-
-# handle race
-ifeq (race,$(findstring race,$(COMETBFT_BUILD_OPTIONS)))
-  CGO_ENABLED=1
-  BUILD_FLAGS += -race
-endif
-
-# handle cleveldb
-ifeq (cleveldb,$(findstring cleveldb,$(COMETBFT_BUILD_OPTIONS)))
-  CGO_ENABLED=1
-  BUILD_TAGS += cleveldb
-endif
-
-# handle badgerdb
-ifeq (badgerdb,$(findstring badgerdb,$(COMETBFT_BUILD_OPTIONS)))
-  BUILD_TAGS += badgerdb
-endif
-
-# handle rocksdb
-ifeq (rocksdb,$(findstring rocksdb,$(COMETBFT_BUILD_OPTIONS)))
-  CGO_ENABLED=1
-  BUILD_TAGS += rocksdb
-endif
-
-# handle boltdb
-ifeq (boltdb,$(findstring boltdb,$(COMETBFT_BUILD_OPTIONS)))
-  BUILD_TAGS += boltdb
-endif
-
-# allow users to pass additional flags via the conventional LDFLAGS variable
-LD_FLAGS += $(LDFLAGS)
-
 # Process Docker environment varible TARGETPLATFORM
 # in order to build binary with correspondent ARCH
 # by default will always build for linux/amd64

common.mk

@@ -0,0 +1,43 @@
+# This contains Makefile logic that is common to several makefiles
+
+BUILD_TAGS ?= cometbft
+
+COMMIT_HASH := $(shell git rev-parse --short HEAD)
+LD_FLAGS = -X github.com/cometbft/cometbft/version.TMGitCommitHash=$(COMMIT_HASH)
+BUILD_FLAGS = -mod=readonly -ldflags "$(LD_FLAGS)"
+# allow users to pass additional flags via the conventional LDFLAGS variable
+LD_FLAGS += $(LDFLAGS)
+
+# handle nostrip
+ifeq (,$(findstring nostrip,$(COMETBFT_BUILD_OPTIONS)))
+  BUILD_FLAGS += -trimpath
+  LD_FLAGS += -s -w
+endif
+
+# handle race
+ifeq (race,$(findstring race,$(COMETBFT_BUILD_OPTIONS)))
+  CGO_ENABLED=1
+  BUILD_FLAGS += -race
+endif
+
+# handle cleveldb
+ifeq (cleveldb,$(findstring cleveldb,$(COMETBFT_BUILD_OPTIONS)))
+  CGO_ENABLED=1
+  BUILD_TAGS += cleveldb
+endif
+
+# handle badgerdb
+ifeq (badgerdb,$(findstring badgerdb,$(COMETBFT_BUILD_OPTIONS)))
+  BUILD_TAGS += badgerdb
+endif
+
+# handle rocksdb
+ifeq (rocksdb,$(findstring rocksdb,$(COMETBFT_BUILD_OPTIONS)))
+  CGO_ENABLED=1
+  BUILD_TAGS += rocksdb
+endif
+
+# handle boltdb
+ifeq (boltdb,$(findstring boltdb,$(COMETBFT_BUILD_OPTIONS)))
+  BUILD_TAGS += boltdb
+endif

test/e2e/Makefile

@@ -1,3 +1,7 @@
+COMETBFT_BUILD_OPTIONS += badgerdb,boltdb,cleveldb,rocksdb
+
+include ../../common.mk
+
 all: docker generator runner
 
 docker:
@@ -10,7 +14,7 @@ docker:
 # order to build a binary with a CometBFT node in it (for built-in
 # ABCI testing).
 node:
-	go build -o build/node -tags badgerdb,boltdb,cleveldb,rocksdb ./node
+	go build $(BUILD_FLAGS) -tags '$(BUILD_TAGS)' -o build/node ./node
 
 generator:
 	go build -o build/generator ./generator