Merge pull request #122 from sapcc/GoReleaser-update

internal/core/config.go

@@ -46,7 +46,7 @@ type Configuration struct {
 	Coverage       CoverageConfiguration        `yaml:"coverageTest"`
 	Golang         GolangConfiguration          `yaml:"golang"`
 	GolangciLint   GolangciLintConfiguration    `yaml:"golangciLint"`
-	Goreleaser     GoreleaserConfiguration      `yaml:"goreleaser"`
+	GoReleaser     GoReleaserConfiguration      `yaml:"goReleaser"`
 	SpellCheck     SpellCheckConfiguration      `yaml:"spellCheck"`
 	GitHubWorkflow *GithubWorkflowConfiguration `yaml:"githubWorkflow"`
 	Makefile       MakefileConfig               `yaml:"makefile"`
@@ -100,8 +100,8 @@ type GolangciLintConfiguration struct {
 	SkipDirs         []string `yaml:"skipDirs"`
 }
 
-type GoreleaserConfiguration struct {
-	Enabled bool `yaml:"enabled"`
+type GoReleaserConfiguration struct {
+	CreateConfig bool `yaml:"createConfig"`
 }
 
 // SpellCheckConfiguration appears in type Configuration.

internal/ghworkflow/workflow_release.go

@@ -23,7 +23,7 @@ func releaseWorkflow(cfg *core.GithubWorkflowConfiguration) {
 		return
 	}
 
-	w.Permissions.Contents = tokenScopeWrite
+	w.Permissions.Contents = tokenScopeRead
 	w.Permissions.Packages = tokenScopeWrite
 
 	w.On.Push.Branches = nil
@@ -37,7 +37,10 @@ func releaseWorkflow(cfg *core.GithubWorkflowConfiguration) {
 	}
 	j.addStep(jobStep{
 		Name: "Generate release info",
-		Run:  "make build/release-info",
+		Run: makeMultilineYAMLString([]string{
+			"go install github.com/sapcc/go-bits/tools/release-info@latest",
+			"release-info CHANGELOG.md $(shell git describe --tags --abbrev=0) > build/release-info",
+		}),
 	})
 	j.addStep(jobStep{
 		Name: "Run GoReleaser",

internal/goreleaser/goreleaser.go

@@ -20,10 +20,7 @@ package goreleaser
 
 import (
 	"fmt"
-	"net/url"
 	"os"
-	"path/filepath"
-	"strings"
 
 	"github.com/sapcc/go-makefile-maker/internal/core"
 
@@ -34,11 +31,6 @@ import (
 const goreleaserTemplate = `before:
   hooks:
     - go mod tidy
-    - rm -rf completions
-    - mkdir completions
-    - go run main.go completion bash >"completions/%[1]s.bash"
-    - go run main.go completion fish >"completions/%[1]s.fish"
-    - go run main.go completion zsh >"completions/%[1]s.zsh"
 
 builds:
   - env:
@@ -55,8 +47,7 @@ builds:
       - -X github.com/sapcc/go-api-declarations/bininfo.binName=%[1]s
       - -X github.com/sapcc/go-api-declarations/bininfo.version={{ .Version }}
       - -X github.com/sapcc/go-api-declarations/bininfo.commit={{ .FullCommit  }}
-      # Use CommitDate instead of Date for reproducibility.
-      - -X github.com/sapcc/go-api-declarations/bininfo.buildDate={{ .CommitDate }}
+      - -X github.com/sapcc/go-api-declarations/bininfo.buildDate={{ .CommitDate }} # use CommitDate instead of Date for reproducibility
     # Set the modified timestamp on the output binary to ensure that builds are reproducible.
     mod_timestamp: "{{ .CommitTimestamp }}"
 
@@ -75,24 +66,6 @@ archives:
       - CHANGELOG.md
       - LICENSE
       - README.md
-      - completions/*
-
-brews:
-  - repository:
-      owner: %[3]s
-      name: %[4]s
-    folder: HomebrewFormula
-    homepage: %[2]s
-    description: Command-line interface for Limes
-    license: Apache-2.0
-    install: |-
-      bin.install "%[1]s"
-      bash_completion.install "completions/%[1]s.bash" => "%[1]s"
-      fish_completion.install "completions/%[1]s.fish"
-      zsh_completion.install "completions/%[1]s.zsh" => "_%[1]s"
-    test: |
-      system "#{bin}/%[1]s --version"
-    commit_msg_template: "Homebrew: update formula to {{ .Tag }}"
 `
 
 func RenderConfig(cfg core.Configuration) {
@@ -103,10 +76,9 @@ func RenderConfig(cfg core.Configuration) {
 		logg.Fatal("Goreleasre requires metadata.url to be configured!")
 	}
 
-	metadataurl := must.Return(url.Parse(cfg.Metadata.URL))
-	githubOrg, githubRepo := filepath.Split(metadataurl.Path)
-
-	goreleaserFile := fmt.Sprintf(goreleaserTemplate, cfg.Binaries[0].Name, cfg.Metadata.URL, strings.ReplaceAll(githubOrg, "/", ""), githubRepo)
+	goreleaserFile := fmt.Sprintf(goreleaserTemplate, cfg.Binaries[0].Name)
 
-	must.Succeed(os.WriteFile(".goreleaser.yml", []byte(goreleaserFile), 0666))
+	// Remove renamed file
+	must.Succeed(os.RemoveAll(".goreleaser.yml"))
+	must.Succeed(os.WriteFile(".goreleaser.yaml", []byte(goreleaserFile), 0666))
 }

main.go

@@ -77,7 +77,7 @@ func main() {
 	}
 
 	// Render Goreleaser config file
-	if cfg.Goreleaser.Enabled {
+	if cfg.GoReleaser.CreateConfig {
 		goreleaser.RenderConfig(cfg)
 	}