Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions internal/core/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const (
CodeqlAnalyzeAction = "github/codeql-action/analyze@v3"
CodeqlAutobuildAction = "github/codeql-action/autobuild@v3"

DownloadSyftAction = "anchore/sbom-action/download-syft@v0.20.5"
GolangciLintAction = "golangci/golangci-lint-action@v8"
GoreleaserAction = "goreleaser/goreleaser-action@v6"
MisspellAction = "reviewdog/action-misspell@v1"
Expand Down
4 changes: 4 additions & 0 deletions internal/ghworkflow/workflow_release.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ func releaseWorkflow(cfg core.Configuration) {
j.Steps[0].With = map[string]any{
"fetch-depth": 0,
}
j.addStep(jobStep{
Name: "Install syft",
Uses: core.DownloadSyftAction,
})
j.addStep(jobStep{
Name: "Generate release info",
Run: makeMultilineYAMLString([]string{
Expand Down
16 changes: 10 additions & 6 deletions internal/goreleaser/goreleaser.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@ archives:
- {{ . }}
{{- end }}

checksum:
name_template: "checksums.txt"

builds:
- binary: '{{ .binaryName }}'
env:
Expand Down Expand Up @@ -46,9 +43,8 @@ builds:
# Set the modified timestamp on the output binary to ensure that builds are reproducible.
mod_timestamp: "{{`{{ .CommitTimestamp }}`}}"

release:
make_latest: true
prerelease: auto
checksum:
name_template: "checksums.txt"

{{- if .githubDomain }}
github_urls:
Expand All @@ -57,5 +53,13 @@ github_urls:
download: https://{{ .githubDomain.Host }}/
{{- end }}

release:
make_latest: true
prerelease: auto

sboms:
- id: archive
artifacts: archive

snapshot:
version_template: "{{`{{ .Tag }}`}}-next"
3 changes: 2 additions & 1 deletion internal/nix/nix-shell.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ func RenderShell(cfg core.Configuration, sr golang.ScanResult, renderGoreleaserC
packages = append(packages, "golangci-lint")
}
if renderGoreleaserConfig {
packages = append(packages, "goreleaser")
// syft is used by goreleaser to generate an SBOM
packages = append(packages, "goreleaser", "syft")
}
runControllerGen := cfg.ControllerGen.Enabled.UnwrapOr(sr.KubernetesController)
if runControllerGen {
Expand Down
Loading