From 7c7b31fb9800f1544eb00e4343244a5b46302fee Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 30 Jul 2024 13:50:31 +0200
Subject: [PATCH] ci: update goreleaser to v2 (#3239) (#3242)

* ci: update goreleaser to v2

* ci: update libwasmvm downloads in goreleaser

* update goreleaser for arm

(cherry picked from commit 767e2ed65d3faac73fce817a55fe0a42432c28c3)

Co-authored-by: MSalopek <matija.salopek994@gmail.com>
---
 .goreleaser.yml | 7 ++++---
 Makefile        | 7 ++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 1438d73add0..7b15cf6c363 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,4 +1,5 @@
 ---
+version: 2
 project_name: gaia
 
 env:
@@ -80,7 +81,7 @@ builds:
     binary: gaiad
     hooks:
       pre:
-        - wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.COSMWASM_VERSION }}/libwasmvm_muslc.x86_64.a -O /usr/lib/x86_64-linux-gnu/libwasmvm_muslc.a
+        - wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.COSMWASM_VERSION }}/libwasmvm_muslc.x86_64.a -O /lib/libwasmvm_muslc.x86_64.a
     goos:
       - linux
     goarch:
@@ -113,7 +114,7 @@ builds:
     binary: gaiad
     hooks:
       pre:
-        - wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.COSMWASM_VERSION }}/libwasmvm_muslc.aarch64.a -O /usr/lib/aarch64-linux-gnu/libwasmvm_muslc.a
+        - wget https://github.com/CosmWasm/wasmvm/releases/download/{{ .Env.COSMWASM_VERSION }}/libwasmvm_muslc.aarch64.a -O /lib/libwasmvm_muslc.aarch64.a
     goos:
       - linux
     goarch:
@@ -185,7 +186,7 @@ snapshot:
   name_template: SNAPSHOT-{{ .Commit }}
 
 changelog:
-  skip: false
+  disable: false
 
 git:
   # What should be used to sort tags when gathering the current and previous
diff --git a/Makefile b/Makefile
index b0f7bbd383d..e4fcbc0d151 100644
--- a/Makefile
+++ b/Makefile
@@ -170,14 +170,13 @@ ifneq ($(strip $(TAG)),)
 		-e CGO_ENABLED=1 \
 		-e TM_VERSION=$(TM_VERSION) \
 		-e COSMWASM_VERSION=$(COSMWASM_VERSION) \
-		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/go/src/gaiad \
 		-w /go/src/gaiad \
 		$(GORELEASER_IMAGE) \
 		release \
 		--snapshot \
 		--skip=publish \
-		--debug \
+		--verbose \
 		--clean
 	@rm -rf dist/
 	@echo "--> Done create-release-dry-run for tag: $(TAG)"
@@ -194,7 +193,6 @@ goreleaser-build-local:
 		-e CGO_ENABLED=1 \
 		-e TM_VERSION=$(TM_VERSION) \
 		-e COSMWASM_VERSION=$(COSMWASM_VERSION) \
-		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/go/src/gaiad \
 		-w /go/src/gaiad \
 		--platform=linux/amd64 \
@@ -204,7 +202,7 @@ goreleaser-build-local:
 		--skip=publish \
 		--release-notes ./RELEASE_NOTES.md \
 		--timeout 90m \
-		--debug
+		--verbose
 
 # uses goreleaser to create static binaries for linux an darwin
 # requires access to GITHUB_TOKEN which has to be available in the CI environment
@@ -216,7 +214,6 @@ ci-release:
 		-e GITHUB_TOKEN=$(GITHUB_TOKEN) \
 		-e TM_VERSION=$(TM_VERSION) \
 		-e COSMWASM_VERSION=$(COSMWASM_VERSION) \
-		-v /var/run/docker.sock:/var/run/docker.sock \
 		-v `pwd`:/go/src/gaiad \
 		-w /go/src/gaiad \
 		--platform=linux/amd64 \