Update goreleaser configs

.goreleaser.prerelease.yml

@@ -2,8 +2,7 @@
 
 project_name: pulumi-docker-build
 builds:
-- id: build-provider
+  - dir: provider
-  dir: provider
     env:
       - CGO_ENABLED=0
       - GO111MODULE=on
@@ -13,17 +12,16 @@ builds:
     goarch:
       - amd64
       - arm64
-  ignore: &a1 []
+    ignore: []
     main: ./cmd/pulumi-resource-docker-build/
-  ldflags: &a2
+    ldflags:
       - -s
       - -w
-    - -X
+      - -X github.com/pulumi/pulumi-docker-build/provider/pkg/version.Version={{.Tag}}
-      github.com/pulumi/pulumi-docker-build/provider/pkg/version.Version={{.Tag}}
       - -X github.com/pulumi/pulumi-docker-build/provider.Version={{.Tag}}
     binary: pulumi-resource-docker-build
-- id: build-provider-sign-windows
+    id: build-provider
-  dir: provider
+  - dir: provider
     env:
       - CGO_ENABLED=0
       - GO111MODULE=on
@@ -32,13 +30,17 @@ builds:
     goarch:
       - amd64
       - arm64
-  ignore: *a1
+    ignore: []
     main: ./cmd/pulumi-resource-docker-build/
-  ldflags: *a2
+    ldflags:
+      - -s
+      - -w
+      - -X github.com/pulumi/pulumi-docker-build/provider/pkg/version.Version={{.Tag}}
+      - -X github.com/pulumi/pulumi-docker-build/provider.Version={{.Tag}}
     binary: pulumi-resource-docker-build
+    id: build-provider-sign-windows
     hooks:
-    post:
+      post: make sign-windows-exe-{{ .Arch }}
-    - make sign-windows-exe-{{ .Arch }}
 archives:
   - name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}"
     id: archive

.goreleaser.yml

@@ -2,8 +2,7 @@
 
 project_name: pulumi-docker-build
 builds:
-- id: build-provider
+  - dir: provider
-  dir: provider
     env:
       - CGO_ENABLED=0
       - GO111MODULE=on
@@ -13,17 +12,16 @@ builds:
     goarch:
       - amd64
       - arm64
-  ignore: &a1 []
+    ignore: []
     main: ./cmd/pulumi-resource-docker-build/
-  ldflags: &a2
+    ldflags:
       - -s
       - -w
-    - -X
+      - -X github.com/pulumi/pulumi-docker-build/provider/pkg/version.Version={{.Tag}}
-      github.com/pulumi/pulumi-docker-build/provider/pkg/version.Version={{.Tag}}
       - -X github.com/pulumi/pulumi-docker-build/provider.Version={{.Tag}}
     binary: pulumi-resource-docker-build
-- id: build-provider-sign-windows
+    id: build-provider
-  dir: provider
+  - dir: provider
     env:
       - CGO_ENABLED=0
       - GO111MODULE=on
@@ -32,13 +30,17 @@ builds:
     goarch:
       - amd64
       - arm64
-  ignore: *a1
+    ignore: []
     main: ./cmd/pulumi-resource-docker-build/
-  ldflags: *a2
+    ldflags:
+      - -s
+      - -w
+      - -X github.com/pulumi/pulumi-docker-build/provider/pkg/version.Version={{.Tag}}
+      - -X github.com/pulumi/pulumi-docker-build/provider.Version={{.Tag}}
     binary: pulumi-resource-docker-build
+    id: build-provider-sign-windows
     hooks:
-    post:
+      post: make sign-windows-exe-{{ .Arch }}
-    - make sign-windows-exe-{{ .Arch }}
 archives:
   - name_template: "{{ .Binary }}-{{ .Tag }}-{{ .Os }}-{{ .Arch }}"
     id: archive

Makefile

@@ -272,7 +272,7 @@ bin/jsign-6.0.jar:
 
 sign-windows-exe-amd64: GORELEASER_ARCH := amd64_v1
 sign-windows-exe-arm64: GORELEASER_ARCH := arm64
-sign-windows-exe-%: SHELL:=/bin/bash
+
 sign-windows-exe-%: bin/jsign-6.0.jar
 	@# Only sign windows binary if fully configured.
 	@# Test variables set by joining with | between and looking for || showing at least one variable is empty.
@@ -284,7 +284,7 @@ sign-windows-exe-%: bin/jsign-6.0.jar
 			echo "To rebuild with signing delete the unsigned windows exe file and rebuild with the fixed configuration"; \
 			if [[ "${CI}" == "true" ]]; then exit 1; fi; \
 		else \
-			file=dist/build-provider-sign-windows_windows_${GORELEASER_ARCH}/pulumi-resource-docker-build.exe; \
+			file=dist/pulumi-docker-build_windows_${GORELEASER_ARCH}/pulumi-resource-docker-build.exe; \
 			mv $${file} $${file}.unsigned; \
 			az login --service-principal \
 				--username "${AZURE_SIGNING_CLIENT_ID}" \