From 05362f08e053c0662dfbbff192047539dfbf1424 Mon Sep 17 00:00:00 2001 From: Daniel Jobson Date: Tue, 17 Mar 2026 10:23:22 +0100 Subject: [PATCH 1/2] Revert "goreleaser: Remove unused recipes" This reverts commit f3a5623ec50eea90764d4fb0af7053eb294f47f7. Turns out we use them after all --- .goreleaser.yaml | 352 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 352 insertions(+) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index b2daf64..d61092d 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -156,6 +156,358 @@ nfpms: - statically-linked-binary - changelog-file-missing-in-native-package +winget: + - # Name of the recipe + # + # Default: ProjectName + # Templates: allowed + name: TkeyRunapp + + # Publisher name. + # + # Templates: allowed + # Required. + publisher: Tillitis + + # Your app's description. + # + # Templates: allowed + # Required. + short_description: "Tool to load an application binary onto the TKey" + + # License name. + # + # Templates: allowed + # Required. + license: "GPLv2" + + # Publisher URL. + # + # Templates: allowed + publisher_url: https://tillitis.se/ + + # Publisher support URL. + # + # Templates: allowed + publisher_support_url: "https://github.com/tillitis/tkey-devtools/issues/new" + + # Package identifier. + # + # Default: Publisher.ProjectName + # Templates: allowed + package_identifier: Tillitis.TkeyRunapp + + # # URL which is determined by the given Token (github, gitlab or gitea). + # # + # # Default depends on the client. + # # Templates: allowed + # url_template: "https://github.mycompany.com/foo/bar/releases/download/{{ .Tag }}/{{ .ArtifactName }}" + + # # Git author used to commit to the repository. + # commit_author: + # name: goreleaserbot + # email: [email protected] + + # # The project name and current git tag are used in the format string. + # # + # # Templates: allowed + # commit_msg_template: "{{ .PackageIdentifier }}: {{ .Tag }}" + + # # Path for the file inside the repository. + # # + # # Default: manifests/// + # path: manifests/g/goreleaser/1.19 + + # Your app's homepage. + homepage: "https://tillitis.se/" + + # Your app's long description. + # + # Templates: allowed + description: "TKey-runapp is a tool to load an application binary onto the Tillitis TKey and start it" + + # License URL. + # + # Templates: allowed + license_url: "https://github.com/tillitis/tkey-devtools/blob/main/LICENSE" + + # Copyright. + # + # Templates: allowed + copyright: "Tillitis AB" + + # Copyright URL. + # + # Templates: allowed + #copyright_url: "https://goreleaser.com/copyright" + + # Setting this will prevent goreleaser to actually try to commit the updated + # package - instead, it will be stored on the dist folder only, + # leaving the responsibility of publishing it to the user. + # + # If set to auto, the release will not be uploaded to the repository + # in case there is an indicator for prerelease in the tag e.g. v1.0.0-rc1 + # + # Templates: allowed + skip_upload: true + + # Release notes. + # + # If you want to use the release notes generated by GoReleaser, use + # `{{.Changelog}}` as the value. + # + # Templates: allowed + release_notes: "{{.Changelog}}" + + # Release notes URL. + # + # Templates: allowed + #release_notes_url: "https://foo.bar/changelog/{{.Version}}" + + # Tags. + # tags: + # - golang + # - cli + + # Repository to push the generated files to. + repository: + # Repository owner. + # + # Templates: allowed + owner: tillitis + + # Repository name. + # + # Templates: allowed + name: winget-pkgs + + # # Optionally a branch can be provided. + # # + # # Default: default repository branch + # # Templates: allowed + # branch: main + + # # Optionally a token can be provided, if it differs from the token + # # provided to GoReleaser + # # Templates: allowed + # token: "{{ .Env.GITHUB_PERSONAL_AUTH_TOKEN }}" + + # # Sets up pull request creation instead of just pushing to the given branch. + # # Make sure the 'branch' property is different from base before enabling + # # it. + # # + # # Since: v1.17 + # pull_request: + # # Whether to enable it or not. + # enabled: true + + # # Whether to open the PR as a draft or not. + # # + # # Since: v1.19 + # draft: true + + # # If the pull request template has checkboxes, enabling this will + # # check all of them. + # # + # # Since: v1.20 (pro). + # # This feature is only available in GoReleaser Pro. + # check_boxex: true + + # # Base can also be another repository, in which case the owner and name + # # above will be used as HEAD, allowing cross-repository pull requests. + # # + # # Since: v1.19 + # base: + # owner: goreleaser + # name: my-repo + # branch: main + + # # Clone, create the file, commit and push, to a regular Git repository. + # # + # # Notice that this will only have any effect if the given URL is not + # # empty. + # # + # # Since: v1.18 + # git: + # # The Git URL to push. + # # + # # Templates: allowed + # url: 'ssh://[email protected]:repo.git' + + # # The SSH private key that should be used to commit to the Git + # # repository. + # # This can either be a path or the key contents. + # # + # # IMPORTANT: the key must not be password-protected. + # # + # # WARNING: do not expose your private key in the configuration file! + # # + # # Templates: allowed + # private_key: '{{ .Env.PRIVATE_KEY_PATH }}' + + # # The value to be passed to `GIT_SSH_COMMAND`. + # # This is mainly used to specify the SSH private key used to pull/push + # # to the Git URL. + # # + # # Default: 'ssh -i {{ .KeyPath }} -o StrictHostKeyChecking=accept-new -F /dev/null' + # # Templates: allowed + # ssh_command: 'ssh -i {{ .Env.KEY }} -o SomeOption=yes' + + +brews: + - + # Name of the recipe + # + # Default: ProjectName + # Templates: allowed + name: tkey-runapp + + # NOTE: make sure the url_template, the token and given repo (github or + # gitlab) owner and name are from the same kind. + # We will probably unify this in the next major version like it is + # done with scoop. + + # URL which is determined by the given Token (github, gitlab or gitea). + # + # Default depends on the client. + # Templates: allowed + #url_template: "https://github.mycompany.com/foo/bar/releases/download/{{ .Tag }}/{{ .ArtifactName }}" + + # Allows you to set a custom download strategy. Note that you'll need + # to implement the strategy and add it to your tap repository. + # Example: https://docs.brew.sh/Formula-Cookbook#specifying-the-download-strategy-explicitly + #download_strategy: CurlDownloadStrategy + + # Allows you to add a custom require_relative at the top of the formula + # template. + #custom_require: custom_download_strategy + + # Git author used to commit to the repository. + commit_author: + name: goreleaserbot + email: bot@goreleaser.com + + # The project name and current git tag are used in the format string. + # + # Templates: allowed + commit_msg_template: "Brew formula update for {{ .ProjectName }} version {{ .Tag }}" + + # Folder inside the repository to put the formula. + folder: Formula + + # Caveats for the user of your binary. + #caveats: "How to use this binary" + + # Your app's homepage. + homepage: "https://tillitis.se/" + + # Your app's description. + # + # Templates: allowed + description: "Tool to load an application binary onto the TKey" + + # SPDX identifier of your app's license. + license: "GPLv2" + + # Setting this will prevent goreleaser to actually try to commit the updated + # formula - instead, the formula file will be stored on the dist folder only, + # leaving the responsibility of publishing it to the user. + # If set to auto, the release will not be uploaded to the homebrew tap + # in case there is an indicator for prerelease in the tag e.g. v1.0.0-rc1 + # + # Templates: allowed + skip_upload: true + + # Packages your package depends on. + # dependencies: + # - name: git + # - name: zsh + # type: optional + # - name: fish + # version: v1.2.3 + # # if providing both version and type, only the type will be taken into + # # account. + # - name: elvish + # type: optional + # version: v1.2.3 + + # # Packages that conflict with your package. + # conflicts: + # - svn + # - bash + + # # Specify for packages that run as a service. + # plist: | + # + # # ... + + # # Service block. + # # + # # Since: v1.7 + # service: | + # run: foo/bar + # # ... + + # # So you can `brew test` your formula. + # # + # # Template: allowed + test: | + assert_match version.to_str, shell_output("#{bin}/tkey-runapp --version 2>&1") + + # Custom install script for brew. + # Template: allowed + # Default: 'bin.install "BinaryName"' + install: | + bin.install "tkey-runapp" + # man1.install "man/tkey-sign.1" + + # # Additional install instructions so you don't need to override `install`. + # # + # # Template: allowed + # # Since: v1.20. + # extra_install: | + # bash_completion.install "completions/foo.bash" => "foo" + # man1.install "man/foo.1.gz" + # # ... + + # # Custom post_install script for brew. + # # Could be used to do any additional work after the "install" script + # post_install: | + # etc.install "app-config.conf" + # # ... + + # Repository to push the generated files to. + repository: + # Repository owner. + # + # Templates: allowed + owner: tillitis + + # Repository name. + # + # Templates: allowed + name: homebrew-tkey + + # Optionally a branch can be provided. + # + # Default: default repository branch + # Templates: allowed + branch: main + + # Sets up pull request creation instead of just pushing to the given branch. + # Make sure the 'branch' property is different from base before enabling + # it. + # + # Since: v1.17 + pull_request: + # Whether to enable it or not. + enabled: true + + # Whether to open the PR as a draft or not. + # + # Since: v1.19 + draft: true + checksum: name_template: 'checksums.txt' snapshot: From 55bd26bb8999e59471d32c7688ee08cf1e0409a2 Mon Sep 17 00:00:00 2001 From: Daniel Jobson Date: Tue, 17 Mar 2026 10:35:18 +0100 Subject: [PATCH 2/2] goreleaser: update brew and winget recipes --- .goreleaser.yaml | 81 +++--------------------------------------------- 1 file changed, 4 insertions(+), 77 deletions(-) diff --git a/.goreleaser.yaml b/.goreleaser.yaml index d61092d..3d6385a 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -179,7 +179,7 @@ winget: # # Templates: allowed # Required. - license: "GPLv2" + license: "BSD-2-Clause" # Publisher URL. # @@ -281,79 +281,6 @@ winget: # Templates: allowed name: winget-pkgs - # # Optionally a branch can be provided. - # # - # # Default: default repository branch - # # Templates: allowed - # branch: main - - # # Optionally a token can be provided, if it differs from the token - # # provided to GoReleaser - # # Templates: allowed - # token: "{{ .Env.GITHUB_PERSONAL_AUTH_TOKEN }}" - - # # Sets up pull request creation instead of just pushing to the given branch. - # # Make sure the 'branch' property is different from base before enabling - # # it. - # # - # # Since: v1.17 - # pull_request: - # # Whether to enable it or not. - # enabled: true - - # # Whether to open the PR as a draft or not. - # # - # # Since: v1.19 - # draft: true - - # # If the pull request template has checkboxes, enabling this will - # # check all of them. - # # - # # Since: v1.20 (pro). - # # This feature is only available in GoReleaser Pro. - # check_boxex: true - - # # Base can also be another repository, in which case the owner and name - # # above will be used as HEAD, allowing cross-repository pull requests. - # # - # # Since: v1.19 - # base: - # owner: goreleaser - # name: my-repo - # branch: main - - # # Clone, create the file, commit and push, to a regular Git repository. - # # - # # Notice that this will only have any effect if the given URL is not - # # empty. - # # - # # Since: v1.18 - # git: - # # The Git URL to push. - # # - # # Templates: allowed - # url: 'ssh://[email protected]:repo.git' - - # # The SSH private key that should be used to commit to the Git - # # repository. - # # This can either be a path or the key contents. - # # - # # IMPORTANT: the key must not be password-protected. - # # - # # WARNING: do not expose your private key in the configuration file! - # # - # # Templates: allowed - # private_key: '{{ .Env.PRIVATE_KEY_PATH }}' - - # # The value to be passed to `GIT_SSH_COMMAND`. - # # This is mainly used to specify the SSH private key used to pull/push - # # to the Git URL. - # # - # # Default: 'ssh -i {{ .KeyPath }} -o StrictHostKeyChecking=accept-new -F /dev/null' - # # Templates: allowed - # ssh_command: 'ssh -i {{ .Env.KEY }} -o SomeOption=yes' - - brews: - # Name of the recipe @@ -393,7 +320,7 @@ brews: commit_msg_template: "Brew formula update for {{ .ProjectName }} version {{ .Tag }}" # Folder inside the repository to put the formula. - folder: Formula + directory: Formula # Caveats for the user of your binary. #caveats: "How to use this binary" @@ -407,7 +334,7 @@ brews: description: "Tool to load an application binary onto the TKey" # SPDX identifier of your app's license. - license: "GPLv2" + license: "BSD-2-Clause" # Setting this will prevent goreleaser to actually try to commit the updated # formula - instead, the formula file will be stored on the dist folder only, @@ -501,7 +428,7 @@ brews: # Since: v1.17 pull_request: # Whether to enable it or not. - enabled: true + enabled: false # Whether to open the PR as a draft or not. #