Skip to content

Commit a41958c

Browse files
marccampbellmarccampbell
committed
bump goreleaser to v2
1 parent 1751834 commit a41958c

File tree

3 files changed

+100
-95
lines changed

3 files changed

+100
-95
lines changed

‎.github/workflows/release.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- name: Run GoReleaser
3131
uses: goreleaser/goreleaser-action@v6
3232
with:
33-
version: "v1.x" # Binary version to install
33+
version: "v2.12.3"
3434
args: release --clean --config deploy/.goreleaser.yaml
3535
env:
3636
GITHUB_TOKEN: ${{ secrets.HOMEBREW_GITHUB_TOKEN }}

‎Makefile‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,6 @@ fmt:
111111
vet:
112112
go vet ${BUILDFLAGS} ${BUILDPATHS}
113113

114-
.PHONY: release
115-
release: export GITHUB_TOKEN = $(shell echo ${GITHUB_TOKEN_TROUBLESHOOT})
116-
release:
117-
curl -sL https://git.io/goreleaser | bash -s -- --rm-dist --config deploy/.goreleaser.yml
118-
119114
.PHONY: snapshot-release
120115
snapshot-release:
121-
curl -sL https://git.io/goreleaser | bash -s -- --rm-dist --snapshot --config deploy/.goreleaser.snapshot.yml
122-
docker push replicated/troubleshoot:alpha
123-
docker push replicated/preflight:alpha
116+
goreleaser release --snapshot --clean --config deploy/.goreleaser.yaml

‎deploy/.goreleaser.yaml‎

Lines changed: 98 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,61 @@
1+
version: 2
12
project_name: troubleshoot
3+
24
builds:
35
- id: preflight
4-
# NOTE: if you add any additional goos/goarch values, ensure you update ../.github/workflows/build-test-deploy.yaml
5-
# specifically the matrix values for goreleaser-test
6-
goos:
7-
- linux
8-
- darwin
9-
goarch:
10-
- amd64
11-
- arm
12-
- arm64
13-
- riscv64
6+
main: ./cmd/preflight/main.go
7+
env: [CGO_ENABLED=0]
8+
goos: [linux, darwin]
9+
goarch: [amd64, arm, arm64, riscv64]
1410
ignore:
1511
- goos: windows
1612
goarch: arm
17-
env:
18-
- CGO_ENABLED=0
19-
main: cmd/preflight/main.go
20-
ldflags: -s -w
21-
-X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
22-
-X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
23-
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
24-
-extldflags "-static"
25-
flags: -tags netgo -tags containers_image_ostree_stub -tags exclude_graphdriver_devicemapper -tags exclude_graphdriver_btrfs -tags containers_image_openpgp -installsuffix netgo
13+
ldflags:
14+
- -s -w
15+
- -X github.com/replicatedhq/troubleshoot/pkg/version.version={{ .Version }}
16+
- -X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{ .Commit }}
17+
- -X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{ .Date }}
18+
- -extldflags "-static"
19+
flags:
20+
- -tags=netgo
21+
- -tags=containers_image_ostree_stub
22+
- -tags=exclude_graphdriver_devicemapper
23+
- -tags=exclude_graphdriver_btrfs
24+
- -tags=containers_image_openpgp
25+
- -installsuffix=netgo
2626
binary: preflight
27-
hooks: {}
27+
2828
- id: support-bundle
29-
goos:
30-
- linux
31-
- darwin
32-
goarch:
33-
- amd64
34-
- arm
35-
- arm64
36-
- riscv64
29+
main: ./cmd/troubleshoot/main.go
30+
env: [CGO_ENABLED=0]
31+
goos: [linux, darwin]
32+
goarch: [amd64, arm, arm64, riscv64]
3733
ignore:
3834
- goos: windows
3935
goarch: arm
40-
env:
41-
- CGO_ENABLED=0
42-
main: cmd/troubleshoot/main.go
43-
ldflags: -s -w
44-
-X github.com/replicatedhq/troubleshoot/pkg/version.version={{.Version}}
45-
-X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{.Commit}}
46-
-X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{.Date}}
47-
-extldflags "-static"
48-
flags: -tags netgo -tags containers_image_ostree_stub -tags exclude_graphdriver_devicemapper -tags exclude_graphdriver_btrfs -tags containers_image_openpgp -installsuffix netgo
36+
ldflags:
37+
- -s -w
38+
- -X github.com/replicatedhq/troubleshoot/pkg/version.version={{ .Version }}
39+
- -X github.com/replicatedhq/troubleshoot/pkg/version.gitSHA={{ .Commit }}
40+
- -X github.com/replicatedhq/troubleshoot/pkg/version.buildTime={{ .Date }}
41+
- -extldflags "-static"
42+
flags:
43+
- -tags=netgo
44+
- -tags=containers_image_ostree_stub
45+
- -tags=exclude_graphdriver_devicemapper
46+
- -tags=exclude_graphdriver_btrfs
47+
- -tags=containers_image_openpgp
48+
- -installsuffix=netgo
4949
binary: support-bundle
50-
hooks: {}
50+
5151
archives:
5252
- id: preflight
53-
builds:
54-
- preflight
55-
format: tar.gz
53+
ids: [preflight]
54+
formats: [tar.gz]
5655
format_overrides:
5756
- goos: windows
58-
format: zip
59-
name_template: 'preflight_{{ .Os }}_{{ .Arch }}'
57+
formats: [zip]
58+
name_template: "preflight_{{ .Os }}_{{ .Arch }}"
6059
files:
6160
- licence*
6261
- LICENCE*
@@ -66,17 +65,16 @@ archives:
6665
- README*
6766
- changelog*
6867
- CHANGELOG*
69-
- src: 'sbom/assets/*'
68+
- src: "sbom/assets/*"
7069
dst: .
71-
strip_parent: true # this is needed to make up for the way unzips work in krew v0.4.1
70+
strip_parent: true
7271
- id: support-bundle
73-
builds:
74-
- support-bundle
75-
format: tar.gz
72+
ids: [support-bundle]
73+
formats: [tar.gz]
7674
format_overrides:
7775
- goos: windows
78-
format: zip
79-
name_template: 'support-bundle_{{ .Os }}_{{ .Arch }}'
76+
formats: [zip]
77+
name_template: "support-bundle_{{ .Os }}_{{ .Arch }}"
8078
files:
8179
- licence*
8280
- LICENCE*
@@ -86,57 +84,71 @@ archives:
8684
- README*
8785
- changelog*
8886
- CHANGELOG*
89-
- src: 'sbom/assets/*'
87+
- src: "sbom/assets/*"
9088
dst: .
91-
strip_parent: true # this is needed to make up for the way unzips work in krew v0.4.1
92-
dockers:
93-
- dockerfile: ./deploy/Dockerfile.troubleshoot
94-
image_templates:
95-
- "replicated/troubleshoot:latest"
96-
- "replicated/troubleshoot:{{ .Major }}"
97-
- "replicated/troubleshoot:{{ .Major }}.{{ .Minor }}"
98-
- "replicated/troubleshoot:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
99-
ids:
100-
- support-bundle
101-
- preflight
102-
- dockerfile: ./deploy/Dockerfile.troubleshoot
103-
image_templates:
104-
- "replicated/preflight:latest"
105-
- "replicated/preflight:{{ .Major }}"
106-
- "replicated/preflight:{{ .Major }}.{{ .Minor }}"
107-
- "replicated/preflight:{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
108-
ids:
109-
- support-bundle
110-
- preflight
89+
strip_parent: true
90+
91+
dockers_v2:
92+
- id: troubleshoot
93+
dockerfile: ./deploy/Dockerfile.troubleshoot
94+
# binaries/packages to COPY in the Dockerfile:
95+
ids: [support-bundle, preflight]
96+
images:
97+
- "replicated/troubleshoot"
98+
tags:
99+
- "latest"
100+
- "{{ .Major }}"
101+
- "{{ .Major }}.{{ .Minor }}"
102+
- "{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
103+
platforms:
104+
- linux/amd64
105+
- linux/arm64
106+
- linux/arm/v7
107+
- linux/riscv64
108+
109+
- id: preflight
110+
dockerfile: ./deploy/Dockerfile.troubleshoot
111+
ids: [support-bundle, preflight]
112+
images:
113+
- "replicated/preflight"
114+
tags:
115+
- "latest"
116+
- "{{ .Major }}"
117+
- "{{ .Major }}.{{ .Minor }}"
118+
- "{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
119+
platforms:
120+
- linux/amd64
121+
- linux/arm64
122+
- linux/arm/v7
123+
- linux/riscv64
124+
111125
universal_binaries:
112-
- ids:
113-
- preflight
126+
- id: preflight-universal
127+
ids: [preflight] # refers to the build id above
114128
replace: true
115129
name_template: preflight
116-
- ids:
117-
- support-bundle
130+
131+
- id: support-bundle-universal
132+
ids: [support-bundle] # refers to the build id above
118133
replace: true
119134
name_template: support-bundle
120-
brews:
135+
136+
homebrew_casks:
121137
- name: preflight
122-
ids:
123-
- preflight
138+
ids: [preflight]
124139
homepage: https://docs.replicated.com/reference/preflight-overview/
125140
description: "A preflight checker and conformance test for Kubernetes clusters."
126141
repository:
127-
name: homebrew-replicated
128142
owner: replicatedhq
143+
name: homebrew-replicated
129144
branch: main
130-
install: bin.install "preflight"
131-
directory: HomebrewFormula
145+
binary: preflight
132146
- name: support-bundle
133-
ids:
134-
- support-bundle
147+
ids: [support-bundle]
135148
homepage: https://docs.replicated.com/reference/support-bundle-overview/
136149
description: "Collect and redact support bundles for Kubernetes clusters."
137150
repository:
138-
name: homebrew-replicated
139151
owner: replicatedhq
152+
name: homebrew-replicated
140153
branch: main
141-
install: bin.install "support-bundle"
142-
directory: HomebrewFormula
154+
binary: support-bundle

0 commit comments

Comments
 (0)