use goreleaser conditionals properly (#422)

* use goreleaser conditionals properly * fix goreleaser config: use inert -v flag to avoid empty flags value * I missed a couple somehow. fixed
ecadlabs · Aug 3, 2023 · b03183a · b03183a
1 parent 8469114
commit b03183a
Showing 1 changed file with 36 additions and 24 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -6,7 +6,8 @@ builds:
       - CGO_ENABLED=1
       - CC=gcc
       - CXX=g++
-      - '{{ if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{ end }}'
+      - >-
+        {{- if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{- end }}
     main: ./cmd/signatory/main.go
     ldflags:
       - '-X github.com/ecadlabs/signatory/pkg/metrics.GitRevision={{.Version}}'
@@ -16,15 +17,16 @@ builds:
     goarch:
       - amd64
     flags:
-      - '{{ if .IsSnapshot }}-cover{{ end }}'
+      - '{{ if .IsSnapshot }}-cover{{ else }}-v{{ end }}'
 
   - id: signatory-cli-linux-amd
     binary: signatory-cli
     env:
       - CGO_ENABLED=1
       - CC=gcc
       - CXX=g++
-      - '{{ if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{ end }}'
+      - >-
+        {{- if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{- end }}
     main: ./cmd/signatory-cli/main.go
     ldflags:
       - '-X github.com/ecadlabs/signatory/pkg/metrics.GitRevision={{.Version}}'
@@ -34,15 +36,16 @@ builds:
     goarch:
       - amd64
     flags:
-      - '{{ if .IsSnapshot }}-cover{{ end }}'
+      - '{{ if .IsSnapshot }}-cover{{ else }}-v{{ end }}'
 
   - id: signatory-linux-arm64
     binary: signatory
     env:
       - CGO_ENABLED=1
       - CC=aarch64-linux-gnu-gcc
       - CXX=aarch64-linux-gnu-g++
-      - '{{ if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{ end }}'
+      - >-
+        {{- if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{- end }}
     main: ./cmd/signatory/main.go
     ldflags:
       - '-X github.com/ecadlabs/signatory/pkg/metrics.GitRevision={{.Version}}'
@@ -52,15 +55,16 @@ builds:
     goarch:
       - arm64
     flags:
-      - '{{ if .IsSnapshot }}-cover{{ end }}'
+      - '{{ if .IsSnapshot }}-cover{{ else }}-v{{ end }}'
 
   - id: signatory-cli-linux-arm64
     binary: signatory-cli
     env:
       - CGO_ENABLED=1
       - CC=aarch64-linux-gnu-gcc
       - CXX=aarch64-linux-gnu-g++
-      - '{{ if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{ end }}'
+      - >-
+        {{- if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{- end }}
     main: ./cmd/signatory-cli/main.go
     ldflags:
       - '-X github.com/ecadlabs/signatory/pkg/metrics.GitRevision={{.Version}}'
@@ -70,15 +74,16 @@ builds:
     goarch:
       - arm64
     flags:
-      - '{{ if .IsSnapshot }}-cover{{ end }}'
+      - '{{ if .IsSnapshot }}-cover{{ else }}-v{{ end }}'
 
   - id: signatory-linux-arm
     binary: signatory
     env:
       - CGO_ENABLED=1
       - CC=arm-linux-gnueabihf-gcc
       - CXX=arm-linux-gnueabihf-g++
-      - '{{ if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{ end }}'
+      - >-
+        {{- if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{- end }}
     main: ./cmd/signatory/main.go
     ldflags:
       - '-X github.com/ecadlabs/signatory/pkg/metrics.GitRevision={{.Version}}'
@@ -91,15 +96,16 @@ builds:
       - '6'
       - '7'
     flags:
-      - '{{ if .IsSnapshot }}-cover{{ end }}'
+      - '{{ if .IsSnapshot }}-cover{{ else }}-v{{ end }}'
 
   - id: signatory-cli-linux-arm
     binary: signatory-cli
     env:
       - CGO_ENABLED=1
       - CC=arm-linux-gnueabihf-gcc
       - CXX=arm-linux-gnueabihf-g++
-      - '{{ if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{ end }}'
+      - >-
+        {{- if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{- end }}
     main: ./cmd/signatory-cli/main.go
     ldflags:
       - '-X github.com/ecadlabs/signatory/pkg/metrics.GitRevision={{.Version}}'
@@ -112,7 +118,7 @@ builds:
       - '6'
       - '7'
     flags:
-      - '{{ if .IsSnapshot }}-cover{{ end }}'
+      - '{{ if .IsSnapshot }}-cover{{ else }}-v{{ end }}'
 
 # MACOS
   - id: signatory-darwin-amd
@@ -121,7 +127,8 @@ builds:
       - CGO_ENABLED=1
       - CC=o64-clang
       - CXX=o64-clang++
-      - '{{ if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{ end }}'
+      - >-
+        {{- if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{- end }}
     main: ./cmd/signatory/main.go
     ldflags:
       - '-X github.com/ecadlabs/signatory/pkg/metrics.GitRevision={{.Version}}'
@@ -131,15 +138,16 @@ builds:
     goarch:
       - amd64
     flags:
-      - '{{ if .IsSnapshot }}-cover{{ end }}'
+      - '{{ if .IsSnapshot }}-cover{{ else }}-v{{ end }}'
 
   - id: signatory-cli-darwing-amd
     binary: signatory-cli
     env:
       - CGO_ENABLED=1
       - CC=o64-clang
       - CXX=o64-clang++
-      - '{{ if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{ end }}'
+      - >-
+        {{- if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{- end }}
     main: ./cmd/signatory-cli/main.go
     ldflags:
       - '-X github.com/ecadlabs/signatory/pkg/metrics.GitRevision={{.Version}}'
@@ -149,15 +157,16 @@ builds:
     goarch:
       - amd64
     flags:
-      - '{{ if .IsSnapshot }}-cover{{ end }}'
+      - '{{ if .IsSnapshot }}-cover{{ else }}-v{{ end }}'
 
   - id: signatory-darwin-arm
     binary: signatory
     env:
       - CGO_ENABLED=1
       - CC=oa64-clang
       - CXX=oa64-clang++
-      - '{{ if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{ end }}'
+      - >-
+        {{- if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{- end }}
     main: ./cmd/signatory/main.go
     ldflags:
       - '-X github.com/ecadlabs/signatory/pkg/metrics.GitRevision={{.Version}}'
@@ -167,15 +176,16 @@ builds:
     goarch:
       - arm64
     flags:
-      - '{{ if .IsSnapshot }}-cover{{ end }}'
+      - '{{ if .IsSnapshot }}-cover{{ else }}-v{{ end }}'
 
   - id: signatory-cli-darwing-arm
     binary: signatory-cli
     env:
       - CGO_ENABLED=1
       - CC=oa64-clang
       - CXX=oa64-clang++
-      - '{{ if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{ end }}'
+      - >-
+        {{- if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{- end }}
     main: ./cmd/signatory-cli/main.go
     ldflags:
       - '-X github.com/ecadlabs/signatory/pkg/metrics.GitRevision={{.Version}}'
@@ -185,7 +195,7 @@ builds:
     goarch:
       - arm64
     flags:
-      - '{{ if .IsSnapshot }}-cover{{ end }}'
+      - '{{ if .IsSnapshot }}-cover{{ else }}-v{{ end }}'
 
 # WINDOWS
   - id: signatory-windows-amd
@@ -194,7 +204,8 @@ builds:
       - CGO_ENABLED=1
       - CC=x86_64-w64-mingw32-gcc
       - CXX=x86_64-w64-mingw32-g++
-      - '{{ if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{ end }}'
+      - >-
+        {{- if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{- end }}
     main: ./cmd/signatory/main.go
     ldflags:
       - '-X github.com/ecadlabs/signatory/pkg/metrics.GitRevision={{.Version}}'
@@ -204,15 +215,16 @@ builds:
     goarch:
       - amd64
     flags:
-      - '{{ if .IsSnapshot }}-cover{{ end }}'
+      - '{{ if .IsSnapshot }}-cover{{ else }}-v{{ end }}'
 
   - id: signatory-cli-windows-amd
     binary: signatory-cli
     env:
       - CGO_ENABLED=1
       - CC=x86_64-w64-mingw32-gcc
       - CXX=x86_64-w64-mingw32-g++
-      - '{{ if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{ end }}'
+      - >-
+        {{- if .IsSnapshot }}GOEXPERIMENT=coverageredesign{{- end }}
     main: ./cmd/signatory-cli/main.go
     ldflags:
       - '-X github.com/ecadlabs/signatory/pkg/metrics.GitRevision={{.Version}}'
@@ -222,7 +234,7 @@ builds:
     goarch:
       - amd64
     flags:
-      - '{{ if .IsSnapshot }}-cover{{ end }}'
+      - '{{ if .IsSnapshot }}-cover{{ else }}-v{{ end }}'
 
 dockers:
   - ids: