fix: fix release config

sixwaaaay · Sep 25, 2023 · d4deb5c · d4deb5c
1 parent 1e6da38
commit d4deb5c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 13 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,4 +1,4 @@
-name: "CI"
+name: "RELEASE"
 on:
   push:
     branches:
@@ -7,7 +7,7 @@ on:
       - 'v[0-9]+.[0-9]+.[0-9]+'
 jobs:
 
-  test:
+  release:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -17,17 +17,12 @@ jobs:
         with:
           go-version: '1.20'
 
-      - name: Setup Environment Variables
-        run: |
-          export GIT_SHA=`git rev-parse HEAD`
-
       - name: Release
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v5
         with:
+          distribution: goreleaser
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GIT_SHA: ${{ env.GIT_SHA }}
-          GIT_REF: "main"
 
diff --git a/.goreleaser.yaml b/.goreleaser.yaml
@@ -5,11 +5,11 @@ builds:
   - env:
       - CGO_ENABLED=0
     goos:
-      - linux
+       - linux
        - windows
        - darwin
     ldflags:
-      - -s -w -X "github.com/nebula-contrib/ngctl/pkg/version.GitRef={{ .Env.GIT_REF }}" -X "github.com/nebula-contrib/ngctl/pkg/version.GitSha={{ .Env.GIT_SHA }}"
+      - -s -w -X "github.com/nebula-contrib/ngctl/pkg/version.GitRef={{ .Branch }}" -X "github.com/nebula-contrib/ngctl/pkg/version.GitSha={{ .ShortCommit }}"
     binary: ngctl
 archives:
   - format: tar.gz
@@ -26,7 +26,6 @@ archives:
       - goos: windows
         format: zip
     files:
-      - ngctl
       - LICENSE
       - README.md
 checksum: