From 6dce8055e59b15f3b551aa4e730a7771d4277f57 Mon Sep 17 00:00:00 2001
From: Marcos Alano <marcoshalano@gmail.com>
Date: Sat, 16 Dec 2023 14:04:46 -0300
Subject: [PATCH] wip

---
 .github/workflows/ci.yml      | 24 +++++++-----------------
 .github/workflows/release.yml |  7 +++----
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f8cabf9..ba00c39 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,28 +54,18 @@ jobs:
       run: go mod tidy && git diff --exit-code
     - name: Run unit tests
       run: go test ./...
-    # - name: Build with Goreleaser
-    #   uses: goreleaser/goreleaser-action@v2
-    #   with:
-    #     version: latest
-    #     args: release --snapshot --skip publish --clean
-
-    - uses: goreleaser/goreleaser-action@7ec5c2b0c6cdda6e8bbb49444bc797dd33d74dd8
+    - name: Build with Goreleaser
+      uses: goreleaser/goreleaser-action@v2
       with:
         version: latest
-        args: release --timeout=1h --snapshot --clean
-      env:
-        SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
-
-
-
+        args: release --snapshot --skip-publish --rm-dist
     - name: Setup BATS framework
       run: sudo npm install -g bats
     - name: kubectx (Go) integration tests
       run: COMMAND=./dist/kubectx_linux_amd64_v1/kubectx bats test/kubectx.bats
     - name: kubens (Go) integration tests
       run: COMMAND=./dist/kubens_linux_amd64_v1/kubens bats test/kubens.bats
-    # - name: Publish Snaps to the Snap Store (edge channel)
-    #   run: for snap in $(ls ./dist/*.snap); do snapcraft upload --release=edge $snap; done
-    #   env:
-    #     SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
+    - name: Publish Snaps to the Snap Store (edge channel)
+      run: for snap in $(ls ./dist/*.snap); do snapcraft upload --release=edge $snap; done
+      env:
+        SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index add12b6..d4c716f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,9 +27,9 @@ jobs:
       uses: actions/setup-go@v2
       with:
         go-version: '1.20'
-    - name: Setup Snapcraft
+    - name: Install Snapcraft
       uses: samuelmeuli/action-snapcraft@v1
-    - id: create-snapcraft-cache-dirs
+    - name: Setup Snapcraft
       run: |
         mkdir -p $HOME/.cache/snapcraft/download
         mkdir -p $HOME/.cache/snapcraft/stage-packages
@@ -51,5 +51,4 @@ jobs:
     - name: Publish Snaps to the Snap Store (stable channel)
       run: for snap in $(ls dist/*.snap); do snapcraft upload --release=stable $snap; done
       env:
-        SNAPCRAFT_STORE_AUTH: candid
-        SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAPCRAFT_TOKEN }}
+        SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.STORE_LOGIN }}