From b270b89801bbc73ff7a81c6dd10b49c99e9eb917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kriszti=C3=A1n=20G=C3=B6drei?= <krisztian.godrei@bitrise.io>
Date: Mon, 20 Jan 2025 12:14:41 +0100
Subject: [PATCH] Update goreleaser config (#1038)

* Update goreleaser config

* Update goreleaser setup workflow

* Migrate goreleaser --rm-dist flag
---
 .goreleaser.yaml |  6 ++++--
 bitrise.yml      | 12 +++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index ba13efecf..27043dfca 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -1,3 +1,5 @@
+version: 2
+
 before:
   hooks:
   - go mod tidy
@@ -38,14 +40,14 @@ archives:
 blobs:
 - provider: gs
   bucket: bitrise-cli-releases-prod
-  folder: /{{ .Tag }}
+  directory: /{{ .Tag }}
   ids:
   - default
 - provider: s3
   bucket: bitrise-cli-releases-prod
   region: us-east-1
   endpoint: "{{ .Env.AWS_ENDPOINT_URL }}"
-  folder: /
+  directory: /
   ids:
   - s3
 
diff --git a/bitrise.yml b/bitrise.yml
index 939a182fa..a4522ed8b 100644
--- a/bitrise.yml
+++ b/bitrise.yml
@@ -326,7 +326,7 @@ step_bundles:
             #!/usr/bin/env bash
             set -ex
 
-            goreleaser release --snapshot --rm-dist
+            goreleaser release --snapshot --clean
     - deploy-to-bitrise-io@2: { }
 
   setup_repo:
@@ -362,14 +362,8 @@ step_bundles:
         - content: |-
             #!/bin/bash
             set -ex
-
-            if [ "$(uname)" = "Linux" ]; then
-              wget -O /tmp/goreleaser.deb https://github.com/goreleaser/goreleaser/releases/download/v1.19.2/goreleaser_1.19.2_amd64.deb
-              sudo dpkg -i /tmp/goreleaser.deb
-            else
-              go install github.com/goreleaser/goreleaser@latest
-              asdf reshim golang
-            fi
+            go install github.com/goreleaser/goreleaser/v2@latest
+            asdf reshim golang
 
 meta:
   bitrise.io: