Skip to content

Commit b36298c

Browse files
committed
Update Goreleaser config
- Unify license to the correct SPDX short identifier - Update config to verison 2 - Remove all comments, making the config more compact and gives the reader a better overview - Correct the path to the man page - Fix copy-paste error from tkey-ssh-agent
1 parent 0efa89a commit b36298c

File tree

1 file changed

+12
-226
lines changed

1 file changed

+12
-226
lines changed

.goreleaser.yaml

Lines changed: 12 additions & 226 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
# Make sure to check the documentation at https://goreleaser.com
2+
version: 2 # Goreleaser v2
3+
24
release:
35
draft: true
46
replace_existing_draft: true
@@ -89,7 +91,7 @@ archives:
8991
allow_different_binary_count: true
9092
# this name template makes the OS and Arch compatible with the results of uname.
9193
name_template: >-
92-
{{ "tkey-ssh-agent" }}_
94+
{{ .ProjectName }}_
9395
{{- .Version }}_
9496
{{- title .Os }}_
9597
{{- if eq .Arch "all" }}universal
@@ -100,294 +102,78 @@ archives:
100102
- goos: windows
101103
format: zip
102104
files:
103-
- src: system/tkey-verification.1
105+
- src: doc/tkey-verification.1
104106
dst: man
105107
strip_parent: true
106108

107109
nfpms:
108-
# note that this is an array of nfpm configs
109-
- #
110-
# ID of the nfpm config, must be unique.
111-
112-
# Name of the package.
113-
package_name: tkey-verification
114-
115-
# Your app's vendor.
110+
- package_name: tkey-verification
116111
vendor: Tillitis AB
117-
118-
# Your app's homepage.
119112
homepage: https://tillitis.se/
120-
121-
# Your app's maintainer (probably you).
122113
maintainer: Tillitis <[email protected]>
123-
124-
# Your app's description.
125114
description: |-
126115
A program to sign or verify the identity of a Tillitis TKey.
127-
128-
# Your app's license.
129-
license: GPL 2.0
130-
131-
# Formats to be generated.
116+
license: "GPL-2.0-only"
132117
formats:
133118
- apk
134119
- deb
135120
- rpm
136121
- archlinux # Since: v1.13
137-
138122
bindir: /usr/bin
139-
140123
release: 1
141-
142124
section: misc
143-
144-
# Contents to add to the package.
145-
# GoReleaser will automatically add the binaries.
146125
contents:
147-
- src: system/tkey-verification.1
126+
- src: doc/tkey-verification.1
148127
dst: /usr/share/man/man1/tkey-verification.1
149128
file_info:
150129
mode: 0644
151-
152-
# Custom configuration applied only to the Deb packager.
153130
deb:
154-
# Lintian overrides
155131
lintian_overrides:
156132
- statically-linked-binary
157133
- changelog-file-missing-in-native-package
158134

159135
winget:
160-
- # Name of the recipe
161-
#
162-
# Default: ProjectName
163-
# Templates: allowed
164-
name: TKeyVerification
165-
166-
# Publisher name.
167-
#
168-
# Templates: allowed
169-
# Required.
136+
- name: TKeyVerification
170137
publisher: Tillitis
171-
172-
# Your app's description.
173-
#
174-
# Templates: allowed
175-
# Required.
176138
short_description: "A program to sign or verify the identity of a Tillitis TKey."
177-
178-
# License name.
179-
#
180-
# Templates: allowed
181-
# Required.
182-
license: "GPLv2"
183-
184-
# Publisher URL.
185-
#
186-
# Templates: allowed
139+
license: "GPL-2.0-only"
187140
publisher_url: https://tillitis.se/
188-
189-
# Publisher support URL.
190-
#
191-
# Templates: allowed
192141
publisher_support_url: "https://github.com/tillitis/tkey-verification/issues/new"
193-
194-
# Package identifier.
195-
#
196-
# Default: Publisher.ProjectName
197-
# Templates: allowed
198142
package_identifier: Tillitis.TKeyVerification
199-
200-
# # URL which is determined by the given Token (github, gitlab or gitea).
201-
# #
202-
# # Default depends on the client.
203-
# # Templates: allowed
204-
# url_template: "https://github.mycompany.com/foo/bar/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
205-
206-
# # Git author used to commit to the repository.
207-
# commit_author:
208-
# name: goreleaserbot
209-
# email: [email protected]
210-
211-
# # The project name and current git tag are used in the format string.
212-
# #
213-
# # Templates: allowed
214-
# commit_msg_template: "{{ .PackageIdentifier }}: {{ .Tag }}"
215-
216-
# # Path for the file inside the repository.
217-
# #
218-
# # Default: manifests/<lowercased first char of publisher>/<publisher>/<version>
219-
# path: manifests/g/goreleaser/1.19
220-
221-
# Your app's homepage.
222143
homepage: "https://tillitis.se/"
223-
224-
# Your app's long description.
225-
#
226-
# Templates: allowed
227144
description: "A program to sign or verify the identity of a Tillitis TKey."
228-
229-
# License URL.
230-
#
231-
# Templates: allowed
232145
license_url: "https://github.com/tillitis/tkey-verification/blob/main/LICENSE"
233-
234-
# Copyright.
235-
#
236-
# Templates: allowed
237146
copyright: "Tillitis AB"
238-
239-
# Copyright URL.
240-
#
241-
# Templates: allowed
242-
#copyright_url: "https://goreleaser.com/copyright"
243-
244-
# Setting this will prevent goreleaser to actually try to commit the updated
245-
# package - instead, it will be stored on the dist folder only,
246-
# leaving the responsibility of publishing it to the user.
247-
#
248-
# If set to auto, the release will not be uploaded to the repository
249-
# in case there is an indicator for prerelease in the tag e.g. v1.0.0-rc1
250-
#
251-
# Templates: allowed
252147
skip_upload: true
253-
254-
# Release notes.
255-
#
256-
# If you want to use the release notes generated by GoReleaser, use
257-
# `{{.Changelog}}` as the value.
258-
#
259-
# Templates: allowed
260148
release_notes: "{{.Changelog}}"
261149

262-
# Release notes URL.
263-
#
264-
# Templates: allowed
265-
#release_notes_url: "https://foo.bar/changelog/{{.Version}}"
266-
267-
# Tags.
268-
# tags:
269-
# - golang
270-
# - cli
271-
272-
# Repository to push the generated files to.
273150
repository:
274-
# Repository owner.
275-
#
276-
# Templates: allowed
277151
owner: tillitis
278-
279-
# Repository name.
280-
#
281-
# Templates: allowed
282152
name: winget-pkgs
283153

284154
brews:
285-
-
286-
# Name of the recipe
287-
#
288-
# Default: ProjectName
289-
# Templates: allowed
290-
name: tkey-verification
291-
292-
# NOTE: make sure the url_template, the token and given repo (github or
293-
# gitlab) owner and name are from the same kind.
294-
# We will probably unify this in the next major version like it is
295-
# done with scoop.
296-
297-
# URL which is determined by the given Token (github, gitlab or gitea).
298-
#
299-
# Default depends on the client.
300-
# Templates: allowed
301-
#url_template: "https://github.mycompany.com/foo/bar/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
302-
303-
# Allows you to set a custom download strategy. Note that you'll need
304-
# to implement the strategy and add it to your tap repository.
305-
# Example: https://docs.brew.sh/Formula-Cookbook#specifying-the-download-strategy-explicitly
306-
#download_strategy: CurlDownloadStrategy
307-
308-
# Allows you to add a custom require_relative at the top of the formula
309-
# template.
310-
#custom_require: custom_download_strategy
311-
312-
# Git author used to commit to the repository.
155+
- name: tkey-verification
313156
commit_author:
314157
name: goreleaserbot
315158
316-
317-
# The project name and current git tag are used in the format string.
318-
#
319-
# Templates: allowed
320159
commit_msg_template: "Brew formula update for {{ .ProjectName }} version {{ .Tag }}"
321-
322-
# Folder inside the repository to put the formula.
323-
folder: Formula
324-
160+
directory: Formula
325161
# Caveats for the user of your binary.
326162
#caveats: "How to use this binary"
327-
328-
# Your app's homepage.
329163
homepage: "https://tillitis.se/"
330-
331-
# Your app's description.
332-
#
333-
# Templates: allowed
334164
description: "A program to sign or verify the identity of a Tillitis TKey."
335-
336-
# SPDX identifier of your app's license.
337-
license: "GPLv2"
338-
339-
# Setting this will prevent goreleaser to actually try to commit the updated
340-
# formula - instead, the formula file will be stored on the dist folder only,
341-
# leaving the responsibility of publishing it to the user.
342-
# If set to auto, the release will not be uploaded to the homebrew tap
343-
# in case there is an indicator for prerelease in the tag e.g. v1.0.0-rc1
344-
#
345-
# Templates: allowed
165+
license: "GPL-2.0-only"
346166
skip_upload: true
347-
348-
# # So you can `brew test` your formula.
349-
# #
350-
# # Template: allowed
351-
# test: |
352-
# assert_match version.to_str, shell_output("#{bin}/tkey-sign --version 2>&1")
353-
354-
# Custom install script for brew.
355-
# Template: allowed
356-
# Default: 'bin.install "BinaryName"'
357167
install: |
358168
bin.install "tkey-verification"
359169
man1.install "man/tkey-verification.1"
360-
361170
# Repository to push the generated files to.
362171
repository:
363-
# Repository owner.
364-
#
365-
# Templates: allowed
366172
owner: tillitis
367-
368-
# Repository name.
369-
#
370-
# Templates: allowed
371173
name: homebrew-tkey
372-
373-
# Optionally a branch can be provided.
374-
#
375-
# Default: default repository branch
376-
# Templates: allowed
377174
branch: main
378-
379-
# Sets up pull request creation instead of just pushing to the given branch.
380-
# Make sure the 'branch' property is different from base before enabling
381-
# it.
382-
#
383-
# Since: v1.17
384175
pull_request:
385-
# Whether to enable it or not.
386176
enabled: true
387-
388-
# Whether to open the PR as a draft or not.
389-
#
390-
# Since: v1.19
391177
draft: true
392178

393179
checksum:

0 commit comments

Comments
 (0)