From d264eefec298b8241e4041e2ff71c417ca4bc752 Mon Sep 17 00:00:00 2001 From: Rootul P Date: Fri, 22 Nov 2024 13:43:44 -0500 Subject: [PATCH] fix: instruct GoReleaser to use current tag (#4044) Closes https://github.com/celestiaorg/celestia-app/issues/4033 ## Testing On my fork v3.3.0-rc0: https://github.com/rootulp/celestia-app/releases/tag/v3.3.0-rc0 v3.3.0-arabica: https://github.com/rootulp/celestia-app/releases/tag/v3.3.0-arabica v3.3.0-mocha: https://github.com/rootulp/celestia-app/releases/tag/v3.3.0-mocha v3.3.0: https://github.com/rootulp/celestia-app/releases/tag/v3.3.0 (cherry picked from commit 63c1e0784da50c7abc9685d3f0472e2b96202d53) --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d946b5af93..16e458e50b 100644 --- a/Makefile +++ b/Makefile @@ -222,7 +222,8 @@ goreleaser-check: fi docker run \ --rm \ - -e CGO_ENABLED=1 \ + --env CGO_ENABLED=1 \ + --env GORELEASER_CURRENT_TAG=${GIT_TAG} \ --env-file .release-env \ -v /var/run/docker.sock:/var/run/docker.sock \ -v `pwd`:/go/src/$(PACKAGE_NAME) \ @@ -239,7 +240,8 @@ prebuilt-binary: fi docker run \ --rm \ - -e CGO_ENABLED=1 \ + --env CGO_ENABLED=1 \ + --env GORELEASER_CURRENT_TAG=${GIT_TAG} \ --env-file .release-env \ -v /var/run/docker.sock:/var/run/docker.sock \ -v `pwd`:/go/src/$(PACKAGE_NAME) \ @@ -285,7 +287,7 @@ enable-mptcp: @echo "net.mptcp.mptcp_path_manager=ndiffports" | sudo tee -a /etc/sysctl.conf @echo "net.mptcp.mptcp_ndiffports=16" | sudo tee -a /etc/sysctl.conf @echo "MPTCP configuration complete and persistent!" - + .PHONY: enable-mptcp ## disable-mptcp: Disables mptcp over multiple ports. Only works on Linux Kernel 5.6 and above. @@ -315,7 +317,6 @@ configure-v3: sed -i "s/^send_rate = .*/send_rate = $(SEND_RECV_RATE)/" $(CONFIG_FILE); \ sed -i "s/ttl-num-blocks = .*/ttl-num-blocks = 12/" $(CONFIG_FILE); \ fi - .PHONY: configure-v3 @@ -324,4 +325,3 @@ debug-version: @echo "GIT_TAG: $(GIT_TAG)" @echo "VERSION: $(VERSION)" .PHONY: debug-version -