Chore: update goreleaser

Luzilla · Apr 18, 2023 · e1ae5c6 · e1ae5c6
1 parent c5d9e94
commit e1ae5c6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 16 deletions.
diff --git a/.github/workflows/goreleaser.yml b/.github/workflows/goreleaser.yml
@@ -4,7 +4,7 @@ name: release
 on:
   push:
     tags:
-      - '*'
+      - 'v*'
 
 jobs:
   goreleaser:
@@ -25,6 +25,6 @@ jobs:
       - uses: goreleaser/goreleaser-action@v2
         with:
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -20,7 +20,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v2
         with:
           version: latest
-          args: release --config ./.goreleaser.ci.yml --rm-dist --snapshot
+          args: release --config ./.goreleaser.ci.yml --clean --snapshot
       - name: Copy .ini files
         run: cp targets.ini rbls.ini ./dist/dnsbl_exporter_linux_amd64_v1
       - name: Upload artifact

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -28,4 +28,4 @@ jobs:
       - uses: goreleaser/goreleaser-action@v2
         with:
           version: latest
-          args: release --snapshot --rm-dist
+          args: release --snapshot --clean
diff --git a/.goreleaser.ci.yml b/.goreleaser.ci.yml
@@ -4,7 +4,6 @@ project_name: dnsbl_exporter
 before:
   hooks:
     - go mod tidy
-    - go generate ./...
 builds:
 - main: ./dnsbl_exporter.go
   binary: dnsbl-exporter
@@ -16,10 +15,6 @@ builds:
 archives:
 - files:
   - none*
-  replacements:
-    linux: Linux
-    386: i386
-    amd64: x86_64
 checksum:
   name_template: 'checksums.txt'
 snapshot:

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -4,7 +4,6 @@ project_name: dnsbl_exporter
 before:
   hooks:
     - go mod tidy
-    - go generate ./...
 builds:
 - main: ./dnsbl_exporter.go
   binary: dnsbl-exporter
@@ -33,6 +32,7 @@ dockers:
   - rbls.ini
   - targets.ini
   goarch: amd64
+  goos: linux
 - image_templates:
   - 'ghcr.io/luzilla/{{.ProjectName}}:{{ .Tag }}-arm64'
   dockerfile: Dockerfile
@@ -49,6 +49,7 @@ dockers:
   - rbls.ini
   - targets.ini
   goarch: arm64
+  goos: linux
 docker_manifests:
 - name_template: ghcr.io/luzilla/{{.ProjectName}}:{{ .Tag }}
   image_templates:
@@ -57,12 +58,6 @@ docker_manifests:
 archives:
 - files:
   - none*
-  replacements:
-    darwin: Darwin
-    linux: Linux
-    windows: Windows
-    386: i386
-    amd64: x86_64
 checksum:
   name_template: 'checksums.txt'
 snapshot: