From 1871d1a8426143daa022b84568282d026f3b24bf Mon Sep 17 00:00:00 2001
From: jon4hz <me@jon4hz.io>
Date: Wed, 1 Feb 2023 03:35:54 +0100
Subject: [PATCH 1/5] fix: improve goreleaser

---
 .goreleaser.yaml               | 14 +++++++++++++-
 cli/packages/util/constants.go |  2 +-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index b2d9f310f..03ffd3e16 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -14,7 +14,9 @@ before:
 builds:
   - id: darwin-build
     binary: infisical
-    ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Env.CLI_VERSION }}
+    ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }}
+    flags:
+      - -trimpath
     env:
       - CGO_ENABLED=1
       - CC=/home/runner/work/osxcross/target/bin/o64-clang
@@ -25,10 +27,14 @@ builds:
       - goos: darwin
         goarch: "386"
     dir: ./cli
+
   - id: all-other-builds
     env:
       - CGO_ENABLED=0
     binary: infisical
+    ldflags: -X github.com/Infisical/infisical-merge/packages/util.CLI_VERSION={{ .Version }}
+    flags:
+      - -trimpath
     goos:
       - freebsd
       - linux
@@ -66,8 +72,10 @@ release:
 
 checksum:
   name_template: 'checksums.txt'
+
 snapshot:
   name_template: "{{ incpatch .Version }}"
+
 changelog:
   sort: asc
   filters:
@@ -81,6 +89,7 @@ changelog:
 #       - infisical
 #     dir: "{{ dir .ArtifactPath }}"
 #     cmd: curl -F package=@{{ .ArtifactName }} https://{{ .Env.FURY_TOKEN }}@push.fury.io/infisical/
+
 brews:
   - name: infisical
     tap:
@@ -92,6 +101,7 @@ brews:
     folder: Formula
     homepage: "https://infisical.com"
     description: "The official Infisical CLI"
+
 nfpms:
 - id: infisical
   package_name: infisical
@@ -117,6 +127,7 @@ nfpms:
       dst: /usr/share/zsh/site-functions/_infisical
     - src: ./manpages/infisical.1.gz
       dst: /usr/share/man/man1/infisical.1.gz
+
 scoop:
   bucket:
     owner: Infisical
@@ -127,6 +138,7 @@ scoop:
   homepage: "https://infisical.com"
   description: "The official Infisical CLI"
   license: MIT
+
 aurs:
   -
     name: infisical-bin
diff --git a/cli/packages/util/constants.go b/cli/packages/util/constants.go
index aaff2cb5b..5c169f6d5 100644
--- a/cli/packages/util/constants.go
+++ b/cli/packages/util/constants.go
@@ -14,5 +14,5 @@ const (
 )
 
 var (
-	CLI_VERSION = "v0.2.11"
+	CLI_VERSION = "devel"
 )

From 723fa153bebbc5241abdad17953c627a822862ef Mon Sep 17 00:00:00 2001
From: jon4hz <me@jon4hz.io>
Date: Wed, 1 Feb 2023 03:36:26 +0100
Subject: [PATCH 2/5] ci: completion and manpages for homebrew

---
 .goreleaser.yaml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 03ffd3e16..020c0418b 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -101,6 +101,12 @@ brews:
     folder: Formula
     homepage: "https://infisical.com"
     description: "The official Infisical CLI"
+    install: |-
+      bin.install infisical
+      bash_completion.install "completions/infisical.bash" => infisical
+      zsh_completion.install "completions/infisical.zsh" => "_infisical"
+      fish_completion.install "completions/infisical.fish"
+      man1.install "manpages/infisical.1.gz"
 
 nfpms:
 - id: infisical

From f9ff99748b15f46f524c2ba5f26f04f2e841cb96 Mon Sep 17 00:00:00 2001
From: jon4hz <me@jon4hz.io>
Date: Wed, 1 Feb 2023 03:37:07 +0100
Subject: [PATCH 3/5] ci: remove obsolete var

---
 .github/workflows/release_build.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
index 326854fa2..0a4d1106f 100644
--- a/.github/workflows/release_build.yml
+++ b/.github/workflows/release_build.yml
@@ -43,7 +43,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }}
           FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }}
           AUR_KEY: ${{ secrets.AUR_KEY }}
-          CLI_VERSION: ${{github.ref_name}}
       - uses: actions/setup-python@v4
       - run: pip install --upgrade cloudsmith-cli
       - name: Publish to CloudSmith 

From 716795532eb5ce420e656eaedb54dc1f8d977382 Mon Sep 17 00:00:00 2001
From: jon4hz <me@jon4hz.io>
Date: Wed, 1 Feb 2023 03:38:18 +0100
Subject: [PATCH 4/5] ci: bump goreleaser action

---
 .github/workflows/release_build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release_build.yml b/.github/workflows/release_build.yml
index 0a4d1106f..3d11a1157 100644
--- a/.github/workflows/release_build.yml
+++ b/.github/workflows/release_build.yml
@@ -34,11 +34,11 @@ jobs:
         run: |
           mkdir ../../osxcross
           git clone https://github.com/plentico/osxcross-target.git ../../osxcross/target
-      - uses: goreleaser/goreleaser-action@v2
+      - uses: goreleaser/goreleaser-action@v4
         with:
           distribution: goreleaser
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GO_RELEASER_GITHUB_TOKEN }}
           FURY_TOKEN: ${{ secrets.FURYPUSHTOKEN }}

From ffda30bd65c692cc113cc5f22d4c2f52f068b005 Mon Sep 17 00:00:00 2001
From: jon4hz <me@jon4hz.io>
Date: Wed, 1 Feb 2023 03:54:22 +0100
Subject: [PATCH 5/5] ci: mark goreleaser snapshots as such

---
 .goreleaser.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.goreleaser.yaml b/.goreleaser.yaml
index 020c0418b..74b69c1b9 100644
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -74,7 +74,7 @@ checksum:
   name_template: 'checksums.txt'
 
 snapshot:
-  name_template: "{{ incpatch .Version }}"
+  name_template: "{{ incpatch .Version }}-devel"
 
 changelog:
   sort: asc