From 1665e1742205376cfcbb16698ccbd7bf79b07375 Mon Sep 17 00:00:00 2001 From: Artur Troian Date: Mon, 2 May 2022 13:27:21 -0400 Subject: [PATCH] build: fix typo in prerel variable name use IS_STABLE to define docker image tag fixes #ENG-287 Signed-off-by: Artur Troian --- .goreleaser.yaml | 2 +- Makefile | 16 +++++++++------- make/releasing.mk | 6 +++--- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 4b75e9f18e..babe8d39b2 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -116,7 +116,7 @@ dockers: goos: linux goarch: amd64 image_templates: - - 'ghcr.io/ovrclk/akash:{{if eq .Env.MAINNET "true"}}stable{{else}}latest{{end}}' + - 'ghcr.io/ovrclk/akash:{{if eq .Env.STABLE "true"}}stable{{else}}latest{{end}}' - 'ghcr.io/ovrclk/akash:{{ .ShortCommit }}' - 'ghcr.io/ovrclk/akash:{{ .Version }}' brews: diff --git a/Makefile b/Makefile index c5bfcfa167..1a004401b4 100644 --- a/Makefile +++ b/Makefile @@ -30,6 +30,7 @@ GIT_HEAD_ABBREV := $(shell git rev-parse --abbrev-ref HEAD) RELEASE_TAG ?= $(shell git describe --tags --abbrev=0) IS_PREREL := $(shell $(ROOT_DIR)/script/is_prerelease.sh "$(RELEASE_TAG)") IS_MAINNET := $(shell $(ROOT_DIR)/script/mainnet-from-tag.sh "$(RELEASE_TAG)") +IS_STABLE ?= false GO_LINKMODE ?= external GO_MOD ?= readonly @@ -37,16 +38,17 @@ BUILD_TAGS ?= osusergo,netgo,ledger,static_build GORELEASER_STRIP_FLAGS ?= ifeq ($(IS_MAINNET), true) - ifeq ($(GORELEASER_IS_PREREL),false) - GORELEASER_HOMEBREW_NAME=akash - GORELEASER_HOMEBREW_CUSTOM= + ifeq ($(IS_PREREL), false) + GORELEASER_HOMEBREW_NAME := akash + GORELEASER_HOMEBREW_CUSTOM := + IS_STABLE := true else - GORELEASER_HOMEBREW_NAME="akash-test" - GORELEASER_HOMEBREW_CUSTOM=keg_only :unneeded, \"This is testnet release. Run brew install ovrclk/tap/akash to install mainnet version\" + GORELEASER_HOMEBREW_NAME := akash-test + GORELEASER_HOMEBREW_CUSTOM := keg_only :unneeded, \"This is testnet release. Run brew install ovrclk/tap/akash to install mainnet version\" endif else - GORELEASER_HOMEBREW_NAME="akash-edge" - GORELEASER_HOMEBREW_CUSTOM=keg_only :unneeded, \"This is edgenet release. Run brew install ovrclk/tap/akash to install mainnet version\" + GORELEASER_HOMEBREW_NAME := akash-edge + GORELEASER_HOMEBREW_CUSTOM := keg_only :unneeded, \"This is edgenet release. Run brew install ovrclk/tap/akash to install mainnet version\" endif GORELEASER_BUILD_VARS := \ diff --git a/make/releasing.mk b/make/releasing.mk index 0803136b77..ef07c73f21 100644 --- a/make/releasing.mk +++ b/make/releasing.mk @@ -39,7 +39,7 @@ docker-image: docker run \ --rm \ --privileged \ - -e MAINNET=$(IS_MAINNET) \ + -e STABLE=$(IS_STABLE) \ -e MOD="$(GO_MOD)" \ -e BUILD_TAGS="$(BUILD_TAGS)" \ -e BUILD_VARS="$(GORELEASER_BUILD_VARS)" \ @@ -66,7 +66,7 @@ release-dry-run: modvendor gen-changelog docker run \ --rm \ --privileged \ - -e MAINNET="$(IS_MAINNET)" \ + -e STABLE=$(IS_STABLE) \ -e MOD="$(GO_MOD)" \ -e BUILD_TAGS="$(BUILD_TAGS)" \ -e BUILD_VARS="$(GORELEASER_BUILD_VARS)" \ @@ -94,7 +94,7 @@ release: modvendor gen-changelog docker run \ --rm \ --privileged \ - -e MAINNET=$(IS_MAINNET) \ + -e STABLE=$(IS_STABLE) \ -e MOD="$(GO_MOD)" \ -e BUILD_TAGS="$(BUILD_TAGS)" \ -e BUILD_VARS="$(GORELEASER_BUILD_VARS)" \