From af9529637bd4d071c4f28b3474163aa529aa73d2 Mon Sep 17 00:00:00 2001
From: Artur Troian <troian.ap@gmail.com>
Date: Thu, 29 Sep 2022 11:58:57 -0400
Subject: [PATCH] build(release): update goreleaser to v1.11.4

release binaries w/ and wo/ version in the file name

Signed-off-by: Artur Troian <troian.ap@gmail.com>
---
 .env                           |  4 +--
 .github/workflows/release.yaml |  3 +-
 .goreleaser.yaml               | 25 ++++++++++++++--
 make/releasing.mk              | 53 ++++++++++++++++++++--------------
 4 files changed, 59 insertions(+), 26 deletions(-)

diff --git a/.env b/.env
index e75d20c0c..ed5f8dea5 100644
--- a/.env
+++ b/.env
@@ -1,7 +1,7 @@
-GOLANG_VERSION=1.18.3
+GOLANG_VERSION=1.19.1
 KIND_VERSION=0.14.0
 KINDEST_VERSION=v1.22.2
-GORELEASER_VERSION=v1.6.3
+GORELEASER_VERSION=v1.11.4
 GO111MODULE=on
 ROOT_DIR=${AP_ROOT}
 AP_DEVCACHE_BASE=${AP_ROOT}/.cache
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 7bdcfe8a1..91f7bb292 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -37,7 +37,7 @@ jobs:
         run: make release-dry-run GORELEASER_SKIP_VALIDATE=true
       - if: startsWith(github.ref,'refs/tags/v')
         name: release dry-run
-        run: make release-dry-run
+        run: make release
         env:
           RELEASE_TAG: ${{ steps.branch_name.outputs.RELEASE_TAG }}
       - if: startsWith(github.ref,'refs/tags/v') && github.repository == 'ovrclk/provider-services'
@@ -46,5 +46,6 @@ jobs:
           sudo rm -rf dist
           make release
         env:
+          GORELEASER_RELEASE: true
           RELEASE_TAG: ${{ steps.branch_name.outputs.RELEASE_TAG }}
           GITHUB_TOKEN: ${{ secrets.GORELEASER_ACCESS_TOKEN }}
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 330b0ee1d..ac824f22b 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -37,8 +37,9 @@ universal_binaries:
     ids:
       - provider-services-darwin
     replace: true
+    name_template: "{{.ProjectName}}"
 archives:
-  - id: provider-services
+  - id: provider-services-version
     builds:
       - darwin-universal
       - provider-services-linux
@@ -47,6 +48,15 @@ archives:
     format: zip
     files:
       - none*
+  - id: provider-services
+    builds:
+      - darwin-universal
+      - provider-services-linux
+    name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
+    wrap_in_directory: true
+    format: zip
+    files:
+      - none*
 
 dockers:
   - dockerfile: Dockerfile
@@ -100,9 +110,20 @@ docker_manifests:
       - ghcr.io/ovrclk/{{ .ProjectName }}:latest-arm64
 
 nfpms:
-  - vendor: "Overclock Labs Inc."
+  - id: w/version
+    vendor: "Overclock Labs Inc."
+    homepage: "https://ovrclk.com"
+    maintainer: "Overclock Labs Inc. <hello@akash.network>"
+    file_name_template: "{{ .ConventionalFileName }}"
+    formats:
+      - deb
+      - rpm
+    license: Apache 2.0
+  - id: wo/version
+    vendor: "Overclock Labs Inc."
     homepage: "https://ovrclk.com"
     maintainer: "Overclock Labs Inc. <hello@akash.network>"
+    file_name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
     formats:
       - deb
       - rpm
diff --git a/make/releasing.mk b/make/releasing.mk
index a37070f90..074b04e04 100644
--- a/make/releasing.mk
+++ b/make/releasing.mk
@@ -1,7 +1,16 @@
-GORELEASER_SKIP_VALIDATE ?= false
+GORELEASER_RELEASE       ?= false
 GORELEASER_DEBUG         ?= false
 GORELEASER_IMAGE         := ghcr.io/goreleaser/goreleaser:$(GORELEASER_VERSION)
 
+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
+	GITHUB_TOKEN=
+endif
+
 ifeq ($(OS),Windows_NT)
 $(error Windows, really?)
 else
@@ -54,25 +63,25 @@ gen-changelog: $(GIT_CHGLOG)
 	@echo "generating changelog to .cache/changelog"
 	./script/genchangelog.sh "$(RELEASE_TAG)" .cache/changelog.md
 
-.PHONY: release-dry-run
-release-dry-run: modvendor gen-changelog
-	docker run \
-		--rm \
-		-e STABLE=$(IS_STABLE) \
-		-e MOD="$(GO_MOD)" \
-		-e BUILD_TAGS="$(BUILD_TAGS)" \
-		-e BUILD_VARS="$(GORELEASER_BUILD_VARS)" \
-		-e STRIP_FLAGS="$(GORELEASER_STRIP_FLAGS)" \
-		-v /var/run/docker.sock:/var/run/docker.sock $(AKASH_BIND_LOCAL) \
-		-v $(shell pwd):/go/src/$(GO_MOD_NAME) \
-		-w /go/src/$(GO_MOD_NAME) \
-		$(GORELEASER_IMAGE) \
-		-f "$(GORELEASER_CONFIG)" \
-		--skip-validate=$(GORELEASER_SKIP_VALIDATE) \
-		--debug=$(GORELEASER_DEBUG) \
-		--rm-dist \
-		--skip-publish \
-		--release-notes=/go/src/$(GO_MOD_NAME)/.cache/changelog.md
+#.PHONY: release-dry-run
+#release-dry-run: modvendor gen-changelog
+#	docker run \
+#		--rm \
+#		-e STABLE=$(IS_STABLE) \
+#		-e MOD="$(GO_MOD)" \
+#		-e BUILD_TAGS="$(BUILD_TAGS)" \
+#		-e BUILD_VARS="$(GORELEASER_BUILD_VARS)" \
+#		-e STRIP_FLAGS="$(GORELEASER_STRIP_FLAGS)" \
+#		-v /var/run/docker.sock:/var/run/docker.sock $(AKASH_BIND_LOCAL) \
+#		-v $(shell pwd):/go/src/$(GO_MOD_NAME) \
+#		-w /go/src/$(GO_MOD_NAME) \
+#		$(GORELEASER_IMAGE) \
+#		-f "$(GORELEASER_CONFIG)" \
+#		--skip-validate=$(GORELEASER_SKIP_VALIDATE) \
+#		--debug=$(GORELEASER_DEBUG) \
+#		--rm-dist \
+#		--skip-publish \
+#		--release-notes=/go/src/$(GO_MOD_NAME)/.cache/changelog.md
 
 .PHONY: release
 release: modvendor gen-changelog
@@ -91,7 +100,9 @@ release: modvendor gen-changelog
 		-v $(shell pwd):/go/src/$(GO_MOD_NAME) \
 		-w /go/src/$(GO_MOD_NAME)\
 		$(GORELEASER_IMAGE) \
-		-f "$(GORELEASER_CONFIG)" release \
+		-f "$(GORELEASER_CONFIG)" \
+		$(GORELEASER_SKIP_PUBLISH) \
+		--skip-validate=$(GORELEASER_SKIP_VALIDATE) \
 		--debug=$(GORELEASER_DEBUG) \
 		--rm-dist \
 		--release-notes=/go/src/$(GO_MOD_NAME)/.cache/changelog.md