From 5849c2f6c0a7dbabbf3d907a084d1fc9bcbecd11 Mon Sep 17 00:00:00 2001
From: Artur Troian <troian.ap@gmail.com>
Date: Mon, 8 Jan 2024 07:13:00 -0500
Subject: [PATCH] build: fix deprecated notices for goreleaser skip flags
 (#1911)

Signed-off-by: Artur Troian <troian.ap@gmail.com>
---
 make/releasing.mk | 27 ++++++++++++++++-----------
 script/tools.sh   | 15 ++++++++++++++-
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/make/releasing.mk b/make/releasing.mk
index f202775470..955f11f4ac 100644
--- a/make/releasing.mk
+++ b/make/releasing.mk
@@ -1,6 +1,5 @@
 GON_CONFIGFILE           ?= gon.json
 
-GORELEASER_SKIP_VALIDATE ?= false
 GORELEASER_DEBUG         ?= false
 GORELEASER_IMAGE         := ghcr.io/goreleaser/goreleaser-cross:$(GOTOOLCHAIN_SEMVER)
 GORELEASER_RELEASE       ?= false
@@ -8,13 +7,20 @@ GORELEASER_MOUNT_CONFIG  ?= false
 
 RELEASE_DOCKER_IMAGE     ?= ghcr.io/akash-network/node
 
-ifeq ($(GORELEASER_RELEASE),true)
-	GORELEASER_SKIP_VALIDATE := false
-	GORELEASER_SKIP_PUBLISH  := release --skip-publish=false
-else
-	GORELEASER_SKIP_PUBLISH  := --skip-publish=true
-	GORELEASER_SKIP_VALIDATE ?= false
+GORELEASER_SKIP_FLAGS    := $(GORELEASER_SKIP)
+GORELEASER_SKIP          :=
+
+null  :=
+space := $(null) #
+comma := ,
+
+ifneq ($(GORELEASER_RELEASE),true)
 	GITHUB_TOKEN=
+	GORELEASER_SKIP_FLAGS += publish
+endif
+
+ifneq ($(GORELEASER_SKIP_FLAGS),)
+	GORELEASER_SKIP := --skip=$(subst $(space),$(comma),$(strip $(GORELEASER_SKIP_FLAGS)))
 endif
 
 ifeq ($(GORELEASER_MOUNT_CONFIG),true)
@@ -68,8 +74,7 @@ docker-image:
 		-f .goreleaser-docker.yaml \
 		--debug=$(GORELEASER_DEBUG) \
 		--clean \
-		--skip-validate \
-		--skip-publish \
+		--skip=publish,validate \
 		--snapshot
 
 .PHONY: gen-changelog
@@ -97,8 +102,8 @@ release: gen-changelog
 		-w /go/src/$(GO_MOD_NAME) \
 		$(GORELEASER_IMAGE) \
 		-f "$(GORELEASER_CONFIG)" \
-		$(GORELEASER_SKIP_PUBLISH) \
-		--skip-validate=$(GORELEASER_SKIP_VALIDATE) \
+		release \
+		$(GORELEASER_SKIP) \
 		--debug=$(GORELEASER_DEBUG) \
 		--clean \
 		--release-notes=/go/src/$(GO_MOD_NAME)/.cache/changelog.md
diff --git a/script/tools.sh b/script/tools.sh
index 599e1a0ec9..e33ce77069 100755
--- a/script/tools.sh
+++ b/script/tools.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -x
+
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
 SEMVER=$SCRIPT_DIR/semver.sh
 
@@ -8,13 +10,24 @@ gomod="$SCRIPT_DIR/../go.mod"
 function get_gotoolchain() {
     local gotoolchain
     local goversion
+    local local_goversion
 
     gotoolchain=$(grep -E '^toolchain go[0-9]{1,}.[0-9]{1,}.[0-9]{1,}$' < "$gomod" | cut -d ' ' -f 2 | tr -d '\n')
+    goversion=$(grep -E '^go [0-9]{1,}.[0-9]{1,}(.[0-9]{1,})?$' < "$gomod" | cut -d ' ' -f 2 | tr -d '\n')
 
     if [[ ${gotoolchain} == "" ]]; then
         # determine go toolchain from go version in go.mod
         if which go > /dev/null 2>&1 ; then
-            goversion=$(GOTOOLCHAIN=local go version | cut -d ' ' -f 3 | sed 's/go*//' | tr -d '\n')
+            local_goversion=$(GOTOOLCHAIN=local go version | cut -d ' ' -f 3 | sed 's/go*//' | tr -d '\n')
+            if [[ $($SEMVER compare "v$local_goversion" v"$goversion") -ge 0 ]]; then
+                goversion=$local_goversion
+            else
+                local_goversion=
+            fi
+        fi
+
+        if [[ "$local_goversion" == "" ]]; then
+            goversion=$(curl -s "https://go.dev/dl/?mode=json&include=all" | jq -r --arg regexp "^go$goversion" '.[] | select(.stable == true) | select(.version | match($regexp)) | .version' | head -n 1 |  sed -e s/^go//)
         fi
 
         if [[ $goversion != "" ]] && [[ $($SEMVER compare "v$goversion" v1.21.0) -ge 0 ]]; then