Skip to content

Commit 2b1d061

Browse files
authored
Add target_commitish to goreleaser spec (#949)
This prevents an issue during release that causes github to create a tag on master instead of on the branch from which the release was created by goreleaser.
1 parent 8b54001 commit 2b1d061

File tree

2 files changed

+65
-65
lines changed

2 files changed

+65
-65
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ name: Build
22

33
on:
44
push:
5-
branches: [ master, v4.0 ]
5+
branches: [master, v4.0]
66

77
pull_request:
8-
branches: [ master, v4.0 ]
8+
branches: [master, v4.0]
99

1010
# This ensures that previous jobs for the PR are canceled when the PR is
1111
# updated.
@@ -35,7 +35,6 @@ jobs:
3535
go test -v ./...
3636
- uses: docker/setup-qemu-action@v3
3737
- name: Check Goreleaser
38-
uses: goreleaser/goreleaser-action@v5
38+
uses: goreleaser/goreleaser-action@v6
3939
with:
40-
version: latest
41-
args: release --skip-publish --skip-sign --clean --snapshot
40+
args: release --skip=publish,sign --clean --snapshot

.goreleaser.yml

Lines changed: 61 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
1+
---
2+
version: 2
13
project_name: directpv
24

35
release:
4-
name_template: "Release version {{.Version}}"
6+
name_template: "Release version {{.Version}}"
57

6-
github:
8+
target_commitish: "{{ .Commit }}"
9+
10+
github:
711
owner: minio
812
name: directpv
913

10-
extra_files:
11-
- glob: "*.minisig"
12-
- glob: "*.zip"
14+
extra_files:
15+
- glob: "*.minisig"
16+
- glob: "*.zip"
1317

1418
before:
1519
hooks:
1620
- go mod tidy -compat=1.22
1721
- go mod download
1822

1923
builds:
20-
-
21-
main: ./cmd/directpv
24+
- main: ./cmd/directpv
2225
id: directpv
2326
binary: directpv
2427
goos:
@@ -35,8 +38,7 @@ builds:
3538
ldflags:
3639
- -s -w -X main.Version={{ .Tag }}
3740

38-
-
39-
main: ./cmd/kubectl-directpv
41+
- main: ./cmd/kubectl-directpv
4042
id: kubectl-directpv
4143
binary: kubectl-directpv
4244
goos:
@@ -61,61 +63,60 @@ builds:
6163
post: ./package.sh {{ .Path }}
6264

6365
archives:
64-
-
65-
allow_different_binary_count: true
66+
- allow_different_binary_count: true
6667
format: binary
6768

6869
changelog:
6970
sort: asc
7071

7172
dockers:
72-
- image_templates:
73-
- "quay.io/minio/directpv:{{ .Tag }}-amd64"
74-
use: buildx
75-
goarch: amd64
76-
ids:
77-
- directpv
78-
dockerfile: Dockerfile
79-
extra_files:
80-
- LICENSE
81-
- CREDITS
82-
- AlmaLinux.repo
83-
build_flag_templates:
84-
- "--platform=linux/amd64"
85-
- image_templates:
86-
- "quay.io/minio/directpv:{{ .Tag }}-ppc64le"
87-
use: buildx
88-
goarch: ppc64le
89-
ids:
90-
- directpv
91-
dockerfile: Dockerfile
92-
extra_files:
93-
- LICENSE
94-
- CREDITS
95-
- AlmaLinux.repo
96-
build_flag_templates:
97-
- "--platform=linux/ppc64le"
98-
- image_templates:
99-
- "quay.io/minio/directpv:{{ .Tag }}-arm64"
100-
use: buildx
101-
goarch: arm64
102-
ids:
103-
- directpv
104-
dockerfile: Dockerfile
105-
extra_files:
106-
- LICENSE
107-
- CREDITS
108-
- AlmaLinux.repo
109-
build_flag_templates:
110-
- "--platform=linux/arm64"
73+
- image_templates:
74+
- "quay.io/minio/directpv:{{ .Tag }}-amd64"
75+
use: buildx
76+
goarch: amd64
77+
ids:
78+
- directpv
79+
dockerfile: Dockerfile
80+
extra_files:
81+
- LICENSE
82+
- CREDITS
83+
- AlmaLinux.repo
84+
build_flag_templates:
85+
- "--platform=linux/amd64"
86+
- image_templates:
87+
- "quay.io/minio/directpv:{{ .Tag }}-ppc64le"
88+
use: buildx
89+
goarch: ppc64le
90+
ids:
91+
- directpv
92+
dockerfile: Dockerfile
93+
extra_files:
94+
- LICENSE
95+
- CREDITS
96+
- AlmaLinux.repo
97+
build_flag_templates:
98+
- "--platform=linux/ppc64le"
99+
- image_templates:
100+
- "quay.io/minio/directpv:{{ .Tag }}-arm64"
101+
use: buildx
102+
goarch: arm64
103+
ids:
104+
- directpv
105+
dockerfile: Dockerfile
106+
extra_files:
107+
- LICENSE
108+
- CREDITS
109+
- AlmaLinux.repo
110+
build_flag_templates:
111+
- "--platform=linux/arm64"
111112
docker_manifests:
112-
- name_template: quay.io/minio/directpv:{{ .Tag }}
113-
image_templates:
114-
- quay.io/minio/directpv:{{ .Tag }}-amd64
115-
- quay.io/minio/directpv:{{ .Tag }}-arm64
116-
- quay.io/minio/directpv:{{ .Tag }}-ppc64le
117-
- name_template: quay.io/minio/directpv:latest
118-
image_templates:
119-
- quay.io/minio/directpv:{{ .Tag }}-amd64
120-
- quay.io/minio/directpv:{{ .Tag }}-arm64
121-
- quay.io/minio/directpv:{{ .Tag }}-ppc64le
113+
- name_template: quay.io/minio/directpv:{{ .Tag }}
114+
image_templates:
115+
- quay.io/minio/directpv:{{ .Tag }}-amd64
116+
- quay.io/minio/directpv:{{ .Tag }}-arm64
117+
- quay.io/minio/directpv:{{ .Tag }}-ppc64le
118+
- name_template: quay.io/minio/directpv:latest
119+
image_templates:
120+
- quay.io/minio/directpv:{{ .Tag }}-amd64
121+
- quay.io/minio/directpv:{{ .Tag }}-arm64
122+
- quay.io/minio/directpv:{{ .Tag }}-ppc64le

0 commit comments

Comments
 (0)